Merge branch 'master' into vector

2015-07-16 16:53:27 +01:00 · 2015-07-16 16:53:27 +01:00 · 75f8363be0
parent 3a6423dd0a e6260987cc
commit 75f8363be0
1 changed files with 1 additions and 1 deletions
--- a/src/controllers/templates/Login.js
+++ b/src/controllers/templates/Login.js
@ -52,7 +52,7 @@ module.exports = {
        var cli = MatrixClientPeg.get();
        this.setState({busy: true});
        var that = this;
-        cli.loginFlows().then(function(result) {
+        cli.loginFlows().done(function(result) {
            that.setState({
                flows: result.flows,
                currentStep: 1,