mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-05 18:05:01 +01:00
4cca1d1e7e
Conflicts: app/controllers/auth/confirmations_controller.rb |
||
---|---|---|
.. | ||
confirmations_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb |