Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00
parent 4665965543 03b69ebc45
commit ba7ee67498
36 changed files with 314 additions and 260 deletions
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -80,7 +80,10 @@ module.exports = {
  settings,
  core,
  flavours,
-  env,
+  env: {
+    CDN_HOST: env.CDN_HOST,
+    NODE_ENV: env.NODE_ENV,
+  },
  loadersDir,
  output,
 };