mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-28 18:43:10 -05:00
be4849c083
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system