mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-14 14:43:50 -05: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