Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`		2023-12-10 18:05:02 +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	Further reduce differences with upstream	2023-12-09 21:19:43 +01:00
fonts	…
hooks	…
icons	…
images	…
mastodon	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
packs	Fix @rails/ujs import on public.jsx (#2482)	2023-11-24 17:40:31 +01:00
skins	…
styles	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
types	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00