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 fa16de4a4e Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream ... Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules.		1 year ago
..
core	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	1 year ago
flavours	[Glitch] Add support for custom sign-up URLs	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 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 commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	1 year ago
packs	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	1 year ago
skins	initial translation of Glitch-specific texts into Czech (#1997)	2 years ago
styles	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream	2 years ago
types	Remove duplicate JPG type (#25054)	2 years ago