feat: cross-server friend join/quit notifications #2

Open

Redstone wants to merge 3 commits from Redstone/core-fork:feat/friend-notification into master

pull from: Redstone/core-fork:feat/friend-notification

merge into: scrow:master

scrow:master

Conversation 0 Commits 3 Files changed 2 +40 -9

Redstone commented 2026-07-06 21:09:12 +02:00

Member

Copy link

No description provided.

Redstone added 1 commit 2026-07-06 21:09:12 +02:00

feat: cross-server friend join/quit notifications bcf811fc82

Redstone added 1 commit 2026-07-06 21:22:18 +02:00

somw fixes f64a5da50d

kento2 added 1 commit 2026-07-06 21:31:43 +02:00

fix some stuff, minor style changes 67e6f8d91c

This pull request has changes conflicting with the target branch.

• README.md

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'feat: cross-server friend join/quit notifications' (#2) from Redstone/core-fork:feat/friend-notification into master

Merge commit body Reviewed-on: http://forge.kentoj.de/scrow/core/pulls/2

Merge pull request 'feat: cross-server friend join/quit notifications' (#2) from Redstone/core-fork:feat/friend-notification into master Reviewed-on: http://forge.kentoj.de/scrow/core/pulls/2 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u feat/friend-notification:Redstone-feat/friend-notification

git switch Redstone-feat/friend-notification

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff Redstone-feat/friend-notification

git switch Redstone-feat/friend-notification

git rebase master

git switch master

git merge --ff-only Redstone-feat/friend-notification

git switch Redstone-feat/friend-notification

git rebase master

git switch master

git merge --no-ff Redstone-feat/friend-notification

git switch master

git merge --squash Redstone-feat/friend-notification

git switch master

git merge --ff-only Redstone-feat/friend-notification

git switch master

git merge Redstone-feat/friend-notification

git push origin master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

scrow/core!2

No description provided.