diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-20 10:45:43 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-20 10:45:43 -0600 |
| commit | 071c2c9c853b7d91127a7c44ec3c71830e0dcb20 (patch) | |
| tree | 406918f6083b54b4d084dd1a20c921fecc32dc64 /config/webpack | |
| parent | 2ca965c704075467226dbf798e13ac8e0e62cc15 (diff) | |
| parent | 0b7a0d15c7e7e23ca0c8bdb738b4a4911bf42eb2 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'config/webpack')
| -rw-r--r-- | config/webpack/configuration.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index a38d9d11d..f6b4d4c61 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, settings.public_output_path), + publicPath: formatPublicPath(env.ASSET_HOST || env.LOCAL_DOMAIN, settings.public_output_path), }; module.exports = { |