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-10 18:59:28 +02:00
2019-07-15 02:29:39 +02:00
2019-04-07 04:59:13 +02:00
2019-06-04 23:11:18 +02:00
2018-10-07 23:44:58 +02:00
2019-03-14 05:28:30 +01:00
2019-07-06 23:26:16 +02:00
2019-07-15 00:48:49 +02:00
2017-04-11 19:31:22 +02:00
2019-07-19 18:26:49 +02:00
2019-07-06 23:26:16 +02:00
2019-07-15 00:48:50 +02:00
2018-06-15 18:00:23 +02:00
2019-06-27 16:44:12 +02:00
2019-07-06 23:26:16 +02:00
2019-07-10 18:59:28 +02:00
2019-01-14 17:28:41 +01:00
2019-07-10 18:59:28 +02:00
2019-07-10 18:59:28 +02:00
2019-07-11 14:49:55 +02:00
2019-07-06 23:26:16 +02:00
2018-11-19 12:49:50 +01:00
2019-04-08 07:28:27 +02:00
2018-10-07 23:44:58 +02:00
2019-03-12 22:58:59 +01:00
2019-07-19 18:26:49 +02:00
2019-06-27 16:44:12 +02:00
2019-07-08 12:03:45 +02:00
2019-07-19 18:26:49 +02:00
2019-07-19 18:26:49 +02:00
2019-07-06 23:26:16 +02:00
2019-07-19 18:26:49 +02:00
2019-06-04 23:11:18 +02:00
2019-07-10 17:10:12 +02:00
2019-07-15 02:29:04 +02:00
2019-04-07 04:59:13 +02:00
2019-07-21 04:08:00 +02:00
2019-06-22 00:13:10 +02:00
2019-07-06 23:26:16 +02:00
2019-07-06 23:26:16 +02:00
2019-07-06 23:26:16 +02:00
2017-03-02 18:49:32 +01:00
2018-12-14 05:07:21 +01:00
2019-01-24 15:38:18 +01:00
2019-06-04 23:11:18 +02:00