Merge upstream changes up to df6086d4027910fb160d531b4fe7ffdec26b0cd7 #2676
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…'s `display_name` is not set (mastodon#29575)
Co-authored-by: GitHub Actions <[email protected]>
…notification types (mastodon#29588)
…oc/merge-upstream
…est if it's `display_name` is not set Port 3156d04 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 1e1d97a to glitch-soc Signed-off-by: Claire <[email protected]>
Port 4991198 to glitch-soc Signed-off-by: Claire <[email protected]>
…filtered notification types Port 95a5713 to glitch-soc Signed-off-by: Claire <[email protected]>
…eb UI Port 30483d6 to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
c6c22bf to
000a900
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge upstream changes up to df6086d
Conflicts
None
Ported changes