Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.		2022-05-11 09:37:48 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
flavours	[Glitch] Fix streaming notifications not using quick filter logic	2022-05-08 21:05:56 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Update win95 style from cybre.space	2022-04-27 23:05:24 +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-05-11 09:37:48 +02:00
packs	Pre-fill domain block/allow domain from search filter (#18172)	2022-04-29 00:24:44 +02: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-05-11 09:37:48 +02:00