mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-19 22:22:53 -05:00
876aa35350
Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.