mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-29 16:46:51 +00:00
1253279feb
Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb |
||
---|---|---|
.. | ||
confirmations_controller.rb | ||
recovery_codes_controller.rb |