Claire c79a03b319 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README.		2022-03-15 20:45:27 +01:00
..
core	[Glitch] Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 21:45:01 +02:00
flavours	[Glitch] Fix edit history dropdown and modal in light theme	2022-03-12 12:03:57 +01:00
fonts	Theme: Windows 95	2017-10-26 23:22:48 -07: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-15 20:45:27 +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-12 11:51:25 +01:00