mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 12:13:18 -05:00
767630be24
Conflicts: - `Gemfile`: Upstream removed blank lines.