Thibaut Girka 2d8be0a6e1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.		2020-07-05 19:35:56 +02:00
..
core	…
flavours	…
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-05 19:35:56 +02:00
packs	…
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-05 19:35:56 +02:00