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.
3 lines
62 B
JavaScript
3 lines
62 B
JavaScript
import '../styles/mailer.scss';
|
|
|
|
require.context('../icons');
|