You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
edit.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago