Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.		2023-12-19 21:24:01 +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 upper border radius of onboarding columns	2023-12-19 20:26:22 +01:00
fonts	…
hooks	…
icons	…
images	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream	2023-12-19 21:24:01 +01:00
packs	Fix @rails/ujs import on public.jsx (#2482)	2023-11-24 17:40:31 +01:00
skins	…
styles	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +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