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 cb70bb8665 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.		1 year ago
..
core	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	1 year ago
flavours	[Glitch] Fix for "follows you" indicator in light web UI not readable	1 year 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 commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream	1 year ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
packs	Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream	1 year ago
skins	initial translation of Glitch-specific texts into Czech (#1997)	2 years ago
styles	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
types	Remove duplicate JPG type (#25054)	2 years ago