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
..
core	Fix CW fold/unfold in remote interaction dialog	2019-02-17 15:40:49 +01:00
flavours	[Glitch] Add UI for enabling/disabling poll notifications	2019-03-13 22:21:52 +01:00
fonts
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +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-13 21:35:43 +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-14 17:17:20 +01:00