mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-22 18:43:49 -05:00
Conflicts: - `yarn.lock`: Upstream touched a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.