about summary refs log tree commit diff
path: root/config/webpack
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-24 19:17:11 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-24 19:17:11 +0000
commit0e10667fbe8b565b05dd2f34c3ee14bed7f36967 (patch)
tree272ee0087b95e4f2dfeb08243bbeb60cc5d8a651 /config/webpack
parent1b4d79acf8a0667b15a6835479d2cae0c2de5612 (diff)
parenta3c0a2037314f105e807f9ede4210066a1524229 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/webpack')
-rw-r--r--config/webpack/configuration.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index c58d8028e..a38d9d11d 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -73,7 +73,7 @@ function formatPublicPath(host = '', path = '') {
 
 const output = {
   path: resolve('public', settings.public_output_path),
-  publicPath: formatPublicPath(env.ASSET_HOST || env.WEB_DOMAIN || env.LOCAL_DOMAIN, settings.public_output_path),
+  publicPath: formatPublicPath(env.ASSET_HOST, settings.public_output_path),
 };
 
 module.exports = {