mirror of https://framagit.org/tykayn/mastodon.git
1253279feb
Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb |
||
---|---|---|
.. | ||
confirmations_controller.rb | ||
recovery_codes_controller.rb |