Claire b0c76eaadd Merge commit '0ad66175bf' 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 '548c032dbb' 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
hooks	[Proposal] Make able to write React in Typescript (#16210)	2023-04-03 03:31:39 +02:00
icons
images	Merge commit '55e7c08a83' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '0ad66175bf' into glitch-soc/merge-upstream	2023-10-24 18:41:20 +02:00
packs	Merge commit '774e1189d2' 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 '126cd7705d' 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