Thibaut Girka e97d76632d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.		2019-03-26 16:01:59 +01:00
..
edit.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:01:59 +01:00