Merge branch 'master' into develop

This commit is contained in:
David Baker 2017-06-22 11:58:05 +01:00
commit 5d159c995d
4 changed files with 22 additions and 8 deletions

View file

@ -48,7 +48,6 @@ class MatrixClientPeg {
this.opts = {
initialSyncLimit: 20,
};
this.indexedDbWorkerScript = null;
}
/**
@ -59,7 +58,7 @@ class MatrixClientPeg {
* @param {string} script href to the script to be passed to the web worker
*/
setIndexedDbWorkerScript(script) {
this.indexedDbWorkerScript = script;
createMatrixClient.indexedDbWorkerScript = script;
}
get(): MatrixClient {