Merge branch 'master' into develop

2017-06-06 17:41:05 +01:00 · 2017-06-06 17:41:05 +01:00 · 9f15e8e152
commit 9f15e8e152
parent 71c12b0615 31f1e421f2
3 changed files with 8 additions and 2 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@ -369,7 +369,6 @@ module.exports = React.createClass({
                this.notifyNewScreen('register');
                break;
            case 'start_password_recovery':
-                if (this.state.loggedIn) return;
                this.setStateForNewScreen({
                    screen: 'forgot_password',
                });