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-11 20:11:09 +02:00
2019-07-06 23:26:16 +02:00
2019-07-23 10:51:07 +02:00
2019-07-22 10:48:50 +02:00
2019-07-21 18:08:02 +02:00
2019-07-23 10:51:07 +02:00
2019-03-18 21:00:55 +01:00
2019-07-07 16:16:51 +02:00
2019-07-23 10:51:07 +02:00
2019-03-16 11:23:22 +01:00
2018-12-14 20:36:40 +01:00
2019-07-08 12:03:45 +02:00
2019-01-16 19:47:46 +01:00