15929a3d59
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
4 lines
64 B
JavaScript
4 lines
64 B
JavaScript
require('../styles/mailer.scss');
|
|
|
|
require.context('../icons');
|