mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-02 13:03:05 -05:00
666760f450
Conflicts: - `package.json`: Upstream fixed a command we have modified in glitch-soc. Updated as upstream did.