Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
..
2019-06-06 18:51:46 +02:00
2019-09-13 16:00:47 +02:00
2017-11-17 19:29:16 -08:00