Claire f56a3dc4e2 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.		2022-03-22 17:00:38 +01:00
..
core	[Glitch] Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 21:45:01 +02:00
flavours	Add missing locales to glitch-soc	2022-03-18 16:41:51 +01:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00