mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 06:33:05 -05:00
6204d13a2e
Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.