mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 08:31:44 +01:00
5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code