mirror of
https://github.com/mastodon/mastodon.git
synced 2025-02-07 17:58:23 +01: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