mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-17 08:03:53 -05:00
Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.