mirror of
https://github.com/funamitech/mastodon
synced 2024-12-02 08:48:39 +09:00
4cca1d1e7e
Conflicts: app/controllers/auth/confirmations_controller.rb |
||
---|---|---|
.. | ||
confirmations_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb |