Merge upstream changes up to f7aab0cc2ff47337021d50ed52428abcb7a9b518 (stable-4.3) #2886
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
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
… regional variant (mastodon#32580)
…oc/backports-4.3 Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.
Port e507b4f to glitch-soc Signed-off-by: Claire <[email protected]>
…`fediverse:creator` Port 7388a6c to glitch-soc Signed-off-by: Claire <[email protected]>
Port 044dd3f to glitch-soc Signed-off-by: Claire <[email protected]>
Port de5f522 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.
Conflicts
app/helpers/application_helper.rb:Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
Ported changes