mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 08:31:44 +01:00
01eaeab56d
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.