Merge upstream - 4.2.11 #59
Merged
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]>
…oc/merge-upstream
Port caf0164 to glitch-soc Signed-off-by: Claire <[email protected]>
Port SCSS changes from 7519ef2 to glitch-soc Signed-off-by: Claire <[email protected]>
…endations & Trends Port SCSS changes from d308901 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 19dbc74 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 85152af
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream added `<s>` to the list of allowed tags, the conflict is because we have a different list of allowed tags. Added `<s>` like upstream did.
Port 2e03dc9 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 7365a13 to glitch-soc Signed-off-by: Claire <[email protected]>
Port fbdda9f to glitch-soc Signed-off-by: Claire <[email protected]>
…tering Port a7b718c to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to b42661b
Port 7e501c5 to glitch-soc Signed-off-by: Claire <[email protected]>
Port f6d090f to glitch-soc Signed-off-by: Claire <[email protected]>
Port 2b1670d to glitch-soc Signed-off-by: Claire <[email protected]>
Port c3e1d86 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 12582d0 to glitch-soc Signed-off-by: Claire <[email protected]>
…scrollbars Port 7d4b602 to glitch-soc Signed-off-by: Claire <[email protected]>
…tus no longer exists Port 0d85a79 to glitch-soc Signed-off-by: Claire <[email protected]>
Port a1ddaa9 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to a1ddaa9
…oc/merge-upstream
Port 9194197 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 5d04e29
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port 32a78e5 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 2d589a5
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.
Just your old fashioned merge upstream after https://github.com/mastodon/mastodon/releases/tag/v4.2.11