1ad91dece8
Conflicts: - `app/javascript/packs/admin.jsx`: Changes applied to `app/javascript/core/admin.js` instead. |
||
---|---|---|
.. | ||
about | ||
accounts | ||
admin | ||
admin_mailer | ||
1ad91dece8
Conflicts: - `app/javascript/packs/admin.jsx`: Changes applied to `app/javascript/core/admin.js` instead. |
||
---|---|---|
.. | ||
about | ||
accounts | ||
admin | ||
admin_mailer | ||