Merge branch 'develop' into travis/openid-widget

2019-03-23 22:48:12 -06:00
parent 1ed2e6dcc1 7b972e476f
commit d3268801ed
34 changed files with 717 additions and 133 deletions
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -21,7 +21,7 @@ import sdk from '../../../index';
 import Analytics from '../../../Analytics';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import * as Lifecycle from '../../../Lifecycle';
-import Velocity from 'velocity-vector';
+import Velocity from 'velocity-animate';
 import { _t } from '../../../languageHandler';

 export default class DeactivateAccountDialog extends React.Component {