diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-10 22:25:36 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-11 00:08:41 +0200 |
| commit | 15929a3d597cc8f50091e602be5277ab00574286 (patch) | |
| tree | e009a465c83a984f0e69776ee3aa0d27401f6e98 /app/javascript/core | |
| parent | 970f06331bc7e482226e974c468b559a9e2f3fa3 (diff) | |
| parent | f09a66b9a741515532a1bfa0f2c3af08d9cc84b6 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
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`.
Diffstat (limited to 'app/javascript/core')
| -rw-r--r-- | app/javascript/core/mailer.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/core/mailer.js b/app/javascript/core/mailer.js index baef7e7fb..a4b6d5446 100644 --- a/app/javascript/core/mailer.js +++ b/app/javascript/core/mailer.js @@ -1 +1,3 @@ -import 'styles/mailer.scss'; +require('../styles/mailer.scss'); + +require.context('../icons'); |