1b06e4e1b7
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.ts | ||
auth.js | ||
common.js | ||
embed.ts | ||
inert.js | ||
mailer.js | ||
remote_interaction_helper.ts | ||
settings.ts | ||
theme.yml | ||
two_factor_authentication.js |