Claire 21e7a53ca5 Merge commit '3b31447408' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one were changed, but otherwise no real conflict. Ported upstream's changes and kept glitch-soc's `i18n:extract`. - `tsconfig.json`: Upstream's dependencies changed the code style rules for json formatting, and we had local changes. Kept our changes, but with upstream's formatting/ - `yarn.lock`: A dependency textually adjacent to a glitch-soc-only one got changed. Applied upstream's change, keeping the glitch-soc-only dependency.		2024-02-28 20:27:28 +01:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
core	Merge commit '899eac1a92' into glitch-soc/merge-upstream	2024-02-28 20:10:01 +01:00
flavours	[Glitch] Use modern ES syntax rather than .call	2024-02-28 20:11:26 +01:00
fonts	Merge commit '7f471e70c0' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks	[Proposal] Make able to write React in Typescript (#16210)	2023-04-03 03:31:39 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge commit '6936e5aa69' into glitch-soc/merge-upstream-composer	2024-02-22 20:58:41 +01:00
mastodon	Merge commit '3b31447408' into glitch-soc/merge-upstream	2024-02-28 20:27:28 +01:00
material-icons	[Glitch] Fix pixel alignment for some composer icons	2024-02-24 15:53:42 +01:00
packs	Merge commit '899eac1a92' into glitch-soc/merge-upstream	2024-02-28 20:10:01 +01:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit '6f7615ba86' into glitch-soc/merge-upstream	2024-02-27 19:20:57 +01:00
svg-icons	Use active variants for boost icons and increase icon size (#27924)	2024-01-24 12:37:43 +00:00
types	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00