Merge upstream changes up to ad95c98054574080ac5d15584b3018d1db836531 #2804
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: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…med `replies` attribute (mastodon#31246)
…oc/merge-upstream Conflicts: - `package.json`: Upstream removed their direct dependency `autoprefixer`, which was textually adjacent to glitch-soc-only dependency `atrament`. Removed direct dependency on `autoprefixer`. - `yarn.lock`: Upstream removed their direct dependency `autoprefixer`, which was textually adjacent to glitch-soc-only dependency `atrament`. Removed direct dependency on `autoprefixer`.
Port f6dc8ae to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…opdown menu Port afdfeb5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port bb3941f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…avatar Port cc453f2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 2ec1181 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…etting to minimize it Port ad95c98 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
1ca81a1
to
096f622
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.
Conflicts
package.json:Upstream removed their direct dependency
autoprefixer, which was textually adjacent to glitch-soc-only dependencyatrament.Removed direct dependency on
autoprefixer.yarn.lock:Upstream removed their direct dependency
autoprefixer, which was textually adjacent to glitch-soc-only dependencyatrament.Removed direct dependency on
autoprefixer.Ported changes