mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-15 16:59:41 +00:00
Conflicts: - `yarn.lock`: Upstream updated dependencies, including one textually adjacent to a glitch-soc-only dependency. Updated dependencies as upstream did.