imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge initial-load.ts into init.ts as its no longer used by Jitsi

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-03-25 14:32:37 +00:00
parent 1f94b25d25
commit 92d8ee355d
3 changed files with 43 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/vector/app.js
View file

@ -41,8 +41,7 @@ import SdkConfig from "matrix-react-sdk/src/SdkConfig";
import {setTheme} from "matrix-react-sdk/src/theme";
import CallHandler from 'matrix-react-sdk/src/CallHandler';
import {loadConfig, preparePlatform} from "./initial-load";
import {loadLanguage, loadOlm} from "./init";
import {loadConfig, preparePlatform, loadLanguage, loadOlm} from "./init";
let lastLocationHashSet = null;