tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
3282bbe454
mastodon/app/controllers/auth
History
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream 
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
2019-07-23 10:51:07 +02:00
..
confirmations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
omniauth_callbacks_controller.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
passwords_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
setup_controller.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00