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
..
core	Fix CW fold/unfold in remote interaction dialog	2019-02-17 15:40:49 +01:00
flavours	[Glitch] Add support for custom emojis in poll options	2019-03-20 17:34:32 +01:00
fonts
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 17:32:39 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-17 12:26:55 +01:00
skins
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:01:59 +01:00