matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge branch 'develop' into dehydration

Browse Source
This commit is contained in:
Hubert Chathi
2020-09-18 18:00:41 -04:00
parent 4398f1eb94 8ec7e7c714
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 {