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 5c962d77bb Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.		2 years ago
..
core	[Glitch] Run eslint --fix	2 years ago
flavours	[Glitch] Change all components to use the same error page in web UI	2 years ago
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
hooks	[Proposal] Make able to write React in Typescript (#16210)	2 years ago
icons	png optimization(loss less) (#19630)	2 years ago
images	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales	Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169)	2 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
packs	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
skins	initial translation of Glitch-specific texts into Czech (#1997)	2 years ago
styles	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
types	New Crowdin updates (#24276)	2 years ago