mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-12 10:42:55 -05:00
4cca1d1e7e
Conflicts: app/controllers/auth/confirmations_controller.rb