Claire bc33be0342 Merge commit '23e32a4b30' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.		2023-12-18 18:07:24 +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	Reduce composer differences with upstream and simplify code (#2518)	2023-12-18 13:20:08 +01:00
fonts
hooks
icons
images	Merge commit '55e7c08a83' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '23e32a4b30' into glitch-soc/merge-upstream	2023-12-18 18:07:24 +01:00
packs	Fix @rails/ujs import on public.jsx (#2482)	2023-11-24 17:40:31 +01:00
skins
styles	Merge commit 'f476d9dab2' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
types	Use Immutable Record for accounts in Redux state (#26559)	2023-11-03 15:00:03 +00:00