mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-06 06:52:48 -05:00
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.