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

Merge branch 'develop' into dehydration

Browse source
This commit is contained in:
Hubert Chathi 2020-09-18 18:00:41 -04:00
commit add36ca4ce
384 changed files with 14620 additions and 9242 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/MatrixClientPeg.ts
View file

@ -31,7 +31,7 @@ import {verificationMethods} from 'matrix-js-sdk/src/crypto';
import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientBackedSettingsHandler";
import * as StorageManager from './utils/StorageManager';
import IdentityAuthClient from './IdentityAuthClient';
import { cacheDehydrationKey, crossSigningCallbacks } from './CrossSigningManager';
import { cacheDehydrationKey, crossSigningCallbacks } from './SecurityManager';
import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
export interface IMatrixClientCreds {