Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +01:00
..
edit.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00