2024 08 02 3 Merge in changes #31
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: 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: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…mastodon#31139) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…e-upstream Merge upstream changes up to 4d374cf
…oc/merge-upstream
Co-authored-by: Renaud Chaput <[email protected]>
…e-upstream Merge upstream changes up to 887e64e
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…re accepted or dismissed (mastodon#31149)
Co-authored-by: Claire <[email protected]>
…oc/merge-upstream
Port 8818748 to glitch-soc Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>
…equests are accepted or dismissed Port dfd4386 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to dd53792
…e-upstream Merge upstream changes up to a50c8e9
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…med `replies` attribute (mastodon#31246)
2024-08-02-2 Merge in upstream changes for testing
…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 <[email protected]>
…opdown menu Port afdfeb5 to glitch-soc Signed-off-by: Claire <[email protected]>
Port bb3941f to glitch-soc Signed-off-by: Claire <[email protected]>
…avatar Port cc453f2 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 2ec1181 to glitch-soc Signed-off-by: Claire <[email protected]>
…etting to minimize it Port ad95c98 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to ad95c98
Update upstream again
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 description provided.