mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 04:03:06 -05:00
5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code