mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 08:31:44 +01:00
4cca1d1e7e
Conflicts: app/controllers/auth/confirmations_controller.rb