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 03846ad6c2 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2 years ago
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
flavours	[Glitch] Add administrative webhooks	2 years ago
fonts	Theme: Windows 95	7 years ago
icons	Change brand color and logotypes (#18592)	2 years ago
images	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
packs	Change brand color and logotypes (#18592)	2 years ago
skins	Glitchsoc translation to 'es' language (#1439)	4 years ago
styles	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago