Merge upstream changes up to 079d681ac6f279f3a7a6be5c3734549f3be8f912 #2808
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
…wnSelector component (mastodon#31338)
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream Conflicts: - `app/javascript/material-icons/400-24px/code.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/mail.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/manufacturing.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/views/admin/settings/shared/_links.html.haml`: Glitch-soc had extra menu items, ported the changes for them too. - `config/navigation.rb`: Glitch-soc had extra menu items, ported the changes for them too.
Port 32ead51 to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]>
Port 84c3cc4 to glitch-soc Signed-off-by: Claire <[email protected]>
…ccounts Port f862936 to glitch-soc Signed-off-by: Claire <[email protected]>
Port ac9040b to glitch-soc Signed-off-by: Claire <[email protected]>
Port 176ba98 to glitch-soc Signed-off-by: Claire <[email protected]>
Port a95fe93 to glitch-soc Signed-off-by: Claire <[email protected]>
…to DropdownSelector component Port 2edae5e to glitch-soc Signed-off-by: Claire <[email protected]>
…al load Port 079d681 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/javascript/material-icons/400-24px/code.svg:Icon newly-introduced upstream.
Used upstream's more recent version.
app/javascript/material-icons/400-24px/mail.svg:Icon newly-introduced upstream.
Used upstream's more recent version.
app/javascript/material-icons/400-24px/manufacturing.svg:Icon newly-introduced upstream.
Used upstream's more recent version.
app/views/admin/settings/shared/_links.html.haml:Glitch-soc had extra menu items, ported the changes for them too.
config/navigation.rb:Glitch-soc had extra menu items, ported the changes for them too.
Ported changes