c81d1b0d38
Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. |
||
|---|---|---|
| .. | ||
| admin.js | ||
| auth.js | ||
| common.js | ||
| embed.js | ||
| mailer.js | ||
| public.js | ||
| settings.js | ||
| theme.yml | ||
| two_factor_authentication.js | ||