Merge remote-tracking branch 'origin/develop' into develop

2018-09-05 14:48:11 +00:00 · 2018-09-05 14:48:11 +00:00 · 22abe5a815
parent f47a9f93a5 736450e184
commit 22abe5a815
2 changed files with 2 additions and 1 deletions
--- a/src/vector/index.js
+++ b/src/vector/index.js
@ -240,7 +240,7 @@ async function loadApp() {
    let configJson;
    let configError;
    try {
-        configJson = getVectorConfig();
+        configJson = await getVectorConfig();
    } catch (e) {
        configError = e;
    }
--- a/webpack.config.js
+++ b/webpack.config.js
@ -130,6 +130,7 @@ module.exports = {
            // bottom of <head> or the bottom of <body>, and I'm a bit scared
            // about moving them.
            inject: false,
+            excludeChunks: ['mobileguide'],
            vars: {
                og_image_url: og_image_url,
            },