Thibaut Girka fcce135d27 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
..
2017-05-08 15:56:00 +02:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-12 17:34:00 +01:00
2019-03-12 17:34:00 +01:00
2019-03-16 11:23:22 +01:00
2019-03-17 16:39:30 +09:00
2019-03-16 11:23:22 +01:00
2018-01-28 22:48:09 +09:00
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-12 17:34:00 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-12 17:34:00 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-12 17:34:00 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00
2019-03-16 11:23:22 +01:00