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

pull/7296/head
Weblate 4 years ago
commit 22abe5a815
  1. 2
      src/vector/index.js
  2. 1
      webpack.config.js

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

@ -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,
},

Loading…
Cancel
Save