matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-02 17:02:31 +03:00
Code Activity

Merge branch 'develop' into bwindels/verification-right-panel

Browse Source
This commit is contained in:
Travis Ralston
2020-01-16 13:10:04 -07:00
parent 72fd1e4e7c 8217c0f05f
commit 1205178e26
124 changed files with 2875 additions and 1834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/crypto/verification/Base.js
View File

@@ -21,13 +21,13 @@ limitations under the License.
import {MatrixEvent} from '../../models/event';
import {EventEmitter} from 'events';
import logger from '../../logger';
import DeviceInfo from '../deviceinfo';
import {logger} from '../../logger';
import {DeviceInfo} from '../deviceinfo';
import {newTimeoutError} from "./Error";
const timeoutException = new Error("Verification timed out");
export default class VerificationBase extends EventEmitter {
export class VerificationBase extends EventEmitter {
/**
* Base class for verification methods.
*