mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-18 00:23:51 -05:00
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system