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

2020-01-16 13:23:32 -07:00
parent 7a88a94936 3ed7beac78
commit d1fcef1211
515 changed files with 9064 additions and 7392 deletions
@@ -16,7 +16,7 @@ limitations under the License.

 import React from 'react';
 import sdk from "../../..";
-import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
+import {verificationMethods} from 'matrix-js-sdk/src/crypto';

 export default class VerificationPanel extends React.PureComponent {
    constructor(props) {