mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-21 01:21:41 +01:00
3869daef09
Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.