Merge upstream changes up to a50c8e951f03a8eb53957ad1c3703155b223ed24 #2803
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
…ob to v0.7.4 (mastodon#31218) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream
Port a50c8e9 to glitch-soc Signed-off-by: Claire <[email protected]>
…ications Port 288961b to glitch-soc Signed-off-by: Claire <[email protected]>
Port front-end changes from 549ab08 to glitch-soc Signed-off-by: Claire <[email protected]>
…pace Port 2c1e757 to glitch-soc Signed-off-by: Claire <[email protected]>
…ange Port a50c8e9 to glitch-soc Signed-off-by: Claire <[email protected]>
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.
No conflicts
Ported changes