Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.		2020-01-20 18:31:11 +01:00
..
core	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
flavours	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-20 18:31:11 +01:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02: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	2020-01-20 18:31:11 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-20 18:31:11 +01:00
skins	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00