1 Commits (576c085ea032a6a72cc2b58ee65320ab73d782ff)

Author	SHA1	Message	Date
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