about summary refs log tree commit diff
path: root/app/javascript/core
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2022-06-24 13:31:43 -0500
committerStarfall <us@starfall.systems>2022-06-24 13:31:43 -0500
commitd83f17f6763a1ffb3569eac73330cb09c557acea (patch)
tree92d392eed60a7d60bbd01e8544202db19a37e3d5 /app/javascript/core
parentb9c901007b9a5772d2553a5770fa479954eec58f (diff)
parent63f79874b59b3ba28c0f940b9d36ea7aacb44c93 (diff)
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/javascript/core')
-rw-r--r--app/javascript/core/mailer.js4
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');