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

pull/7296/head
Weblate 2018-09-05 14:48:11 +00:00
commit 22abe5a815
2 changed files with 2 additions and 1 deletions

View File

@ -240,7 +240,7 @@ async function loadApp() {
let configJson; let configJson;
let configError; let configError;
try { try {
configJson = getVectorConfig(); configJson = await getVectorConfig();
} catch (e) { } catch (e) {
configError = e; configError = e;
} }

View File

@ -130,6 +130,7 @@ module.exports = {
// bottom of <head> or the bottom of <body>, and I'm a bit scared // bottom of <head> or the bottom of <body>, and I'm a bit scared
// about moving them. // about moving them.
inject: false, inject: false,
excludeChunks: ['mobileguide'],
vars: { vars: {
og_image_url: og_image_url, og_image_url: og_image_url,
}, },