Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream changed one import, close to a glitch-soc-only import to handle different max character counts. Ported upstream's change.		2023-10-24 18:41:20 +02:00
..
core	Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream	2023-09-15 20:08:09 +02:00
flavours	[Glitch] Upgrade to react-router v5	2023-10-21 22:14:24 +02:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02: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 '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream	2023-10-24 18:41:20 +02:00
packs	Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream	2023-10-09 21:12:28 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream	2023-10-19 20:48:22 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00