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 817b0e20d2 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. - `yarn.lock`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one.		3 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
flavours	Fix status open hotkey	3 years ago
fonts	Theme: Windows 95	7 years ago
images	Merge branch 'master' into glitch-soc/merge-upstream	5 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	Add ability to require invite request text (#15326)	4 years ago
skins	Glitchsoc translation to 'es' language (#1439)	4 years ago
styles	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago