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
..
2017-11-11 20:23:33 +01:00
2018-12-22 20:02:09 +01:00
2018-12-22 20:02:09 +01:00
2018-02-21 23:21:32 +01:00
2018-02-21 23:21:32 +01:00
2017-11-11 20:23:33 +01:00
2017-11-11 20:23:33 +01:00
2017-11-11 20:23:33 +01:00
2019-01-08 13:39:49 +01:00
2018-08-19 00:58:53 +02:00
2019-03-04 22:47:47 +01:00
2018-07-13 02:16:06 +02:00
2018-04-02 22:04:14 +02:00
2017-11-11 20:23:33 +01:00
2017-11-11 20:23:33 +01:00
2019-07-19 18:26:49 +02:00
2018-12-06 17:36:11 +01:00
2019-03-14 05:28:30 +01:00