Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`. |
||
|---|---|---|
| .. | ||
| admin.jsx | ||
| application.js | ||
| common.js | ||
| error.js | ||
| public-path.js | ||
| public.jsx | ||
| share.jsx | ||
| sign_up.js | ||
Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`. |
||
|---|---|---|
| .. | ||
| admin.jsx | ||
| application.js | ||
| common.js | ||
| error.js | ||
| public-path.js | ||
| public.jsx | ||
| share.jsx | ||
| sign_up.js | ||