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-07-30 11:10:46 +02:00
2018-10-07 23:44:58 +02:00
2017-03-02 18:49:32 +01:00