Claire ba527c071f Merge commit '134de736dc' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream changed how icons are handled, including on a line modified by glitch-soc to bump the number of poll options. Applied upstream's change, while keeping the increased number of poll options.		2023-10-25 12:14:24 +02:00
..
__mocks__	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00
core	Fix @rails/ujs imports	2023-10-24 20:23:31 +02:00
flavours	[Glitch] Fix double scroll bars in some columns in advanced interface	2023-10-24 20:46:11 +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 '55e7c08a83' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '134de736dc' into glitch-soc/merge-upstream	2023-10-25 12:14:24 +02:00
packs	Merge commit 'e93a75f1a1' into glitch-soc/merge-upstream	2023-10-24 19:59:19 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit '134de736dc' into glitch-soc/merge-upstream	2023-10-25 12:14:24 +02:00
types	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00