Thibaut Girka dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/simple_form.pl.yml		2019-01-16 14:20:07 +01:00
..
core	Port a few public.js changes from upstream, move some code around	2019-01-10 18:45:17 +01:00
flavours	[Glitch] Adjust admin UI right panel size	2019-01-13 20:41:38 +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-01-16 14:20:07 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-13 14:41:06 +01:00
skins
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-16 14:20:07 +01:00