Claire 7b09f585fa Merge commit 'bb51c0676d' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Upstream refactored slightly (but touching almost all the lines in the code), glitch-soc had moved a few of the code to another file. Refactored as upstream did.		2023-08-24 20:34:14 +02:00
..
core	Fix interaction modal being broken because of glitch-soc's theming system	2023-07-30 16:45:50 +02:00
flavours	[Glitch] Fix “legal” report category not showing up in moderation interface	2023-08-22 18:54:22 +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 '1cb978bcc3' into glitch-soc/merge-upstream	2023-08-22 18:50:14 +02:00
packs	Merge commit 'bb51c0676d' into glitch-soc/merge-upstream	2023-08-24 20:34:14 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit '1cb978bcc3' into glitch-soc/merge-upstream	2023-08-22 18:50:14 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00