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

..

migrate

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

post_migrate

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-23 10:51:07 +02:00

schema.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-23 10:51:07 +02:00

seeds.rb

Change unconfirmed user login behaviour (#11375)

2019-07-22 10:48:50 +02:00