mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2026-05-05 04:06:44 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weblate 2018-09-05 14:48:11 +00:00
commit 22abe5a815
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vector/index.js
View File

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

1
webpack.config.js
View File

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