mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-23 02:53:48 -05:00
Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency.