mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-17 08:03:53 -05:00
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.