nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Travis Ralston
2020-01-16 13:23:32 -07:00
parent 7a88a94936 3ed7beac78
commit d1fcef1211
515 changed files with 9064 additions and 7392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/dialogs/DeviceVerifyDialog.js
View File

@@ -19,11 +19,11 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import MatrixClientPeg from '../../../MatrixClientPeg';
import sdk from '../../../index';
import {MatrixClientPeg} from '../../../MatrixClientPeg';
import * as sdk from '../../../index';
import * as FormattingUtils from '../../../utils/FormattingUtils';
import { _t } from '../../../languageHandler';
import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
import {verificationMethods} from 'matrix-js-sdk/src/crypto';
import {ensureDMExists} from "../../../createRoom";
import dis from "../../../dispatcher";
import SettingsStore from '../../../settings/SettingsStore';