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
..
index.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-18 17:25:56 +02:00