Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.		2024-01-10 17:51:12 +01: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 loading local accounts with extraneous domain part in WebUI	2024-01-02 18:16:57 +01: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 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream	2024-01-10 17:51:12 +01:00
packs	Fix @rails/ujs import on public.jsx (#2482)	2023-11-24 17:40:31 +01:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream	2023-12-29 17:40:57 +01:00
svg-icons	Add icons for private and disabled boost in web UI (#27817)	2023-11-13 14:39:45 +00:00
types	Use Immutable Record for accounts in Redux state (#26559)	2023-11-03 15:00:03 +00:00