mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-14 19:53:06 -05:00
01eaeab56d
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.