Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.		2020-04-05 18:32:06 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-05 18:32:06 +02:00
flavours	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-05 18:32:06 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +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	2020-04-05 18:32:06 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-05 18:32:06 +02: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-04-04 21:47:37 +02:00