Claire 1b06e4e1b7 Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: In glitch-soc, this file was split across the following files: - `app/javascript/packs/public.jsx` - `app/javascript/core/embed.js` - `app/javascript/core/settings.js` Update all those files accordingly, as well as the related `theme.yml` files.		2024-03-15 22:37:55 +01:00
..
__mocks__	…
core	Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream	2024-03-15 22:37:55 +01:00
flavours	…
fonts	…
hooks	…
icons	…
images	…
mastodon	…
material-icons	Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream	2024-03-15 18:48:39 +01:00
packs	…
skins	…
styles	…
svg-icons	…
types	…