mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 21:15:58 +00:00
444796b69b
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb |
||
---|---|---|
.. | ||
authorizations_controller.rb | ||
authorized_applications_controller.rb | ||
tokens_controller.rb |