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
..
2018-12-19 07:24:03 +01:00
2018-12-19 08:56:59 +01:00
2018-12-19 18:24:15 +01:00
2018-12-20 03:24:28 +01:00
2018-12-20 03:47:51 +01:00
2018-12-20 03:51:41 +01:00
2019-01-08 13:39:49 +01:00
2018-12-20 04:23:09 +01:00
2018-12-20 17:52:07 +01:00
2018-12-20 17:52:18 +01:00
2018-12-20 17:52:07 +01:00
2018-12-20 17:52:07 +01:00
2018-12-19 12:58:49 +01:00
2018-12-20 17:52:07 +01:00
2018-12-20 17:51:55 +01:00