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. |
||
|---|---|---|
| .. | ||
| admin.tsx | ||
| application.js | ||
| common.js | ||
| error.js | ||
| public-path.js | ||
| public.tsx | ||
| share.jsx | ||
| sign_up.js | ||