Claire 6e9f89e5b6 Merge commit 'c85e0a6b04' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc - `app/javascript/packs/public.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc		2023-10-25 12:18:45 +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 'c85e0a6b04' into glitch-soc/merge-upstream	2023-10-25 12:18:45 +02:00
packs	Update rails/ujs delegate method usage (#27538)	2023-10-24 20:38:19 +00: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