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

2017-11-18 12:25:54 +00:00 · 2017-11-18 12:25:54 +00:00 · 1b24e643de
parent ee35fdb483 21d7c4d92a
commit 1b24e643de
1 changed files with 1 additions and 1 deletions
--- a/src/vector/index.js
+++ b/src/vector/index.js
@ -370,7 +370,7 @@ async function loadApp() {
 }

 async function loadLanguage() {
-    const prefLang = SettingsStore.getValue("language");
+    const prefLang = SettingsStore.getValue("language", null, /*excludeDefault=*/true);
    let langs = [];

    if (!prefLang) {