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
..
2019-07-19 18:26:49 +02:00
2019-07-21 20:57:42 +02:00
2019-06-10 18:59:53 +02:00
2019-07-23 10:51:07 +02:00
2019-07-23 10:51:07 +02:00
2019-07-23 10:51:07 +02:00