mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 03:00:33 +02:00
Conflicts: - `spec/controllers/application_controller_spec.rb`: Upstream moved specs that were textually-adjacent to glitch-soc ones. Kept the glitch-soc ones.