mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-25 11:56:36 +00:00
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code