mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-17 08:50:54 -04:00
Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies.