mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-14 16:28:59 +00:00
Conflicts: - `yarn.lock`: Upstream updated dependencies textually adjacent to glitch-soc-only ones. Updated them as upstream did.
Conflicts: - `yarn.lock`: Upstream updated dependencies textually adjacent to glitch-soc-only ones. Updated them as upstream did.