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 b0781a933d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		3 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
flavours	[Glitch] Replace deprecated String.prototype.substr()	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	Merge branch 'main' into glitch-soc/merge-upstream	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