mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
1253279feb
Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb |
||
---|---|---|
.. | ||
confirmations_controller.rb | ||
recovery_codes_controller.rb |