You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire c6e7c928ab 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.		3 years ago
..
core	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
flavours	[Glitch] Fix streaming notifications not using quick filter logic	3 years ago
fonts	Theme: Windows 95	7 years ago
images	Update win95 style from cybre.space	3 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
packs	Pre-fill domain block/allow domain from search filter (#18172)	3 years ago
skins	Glitchsoc translation to 'es' language (#1439)	4 years ago
styles	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago