OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into vector

pull/1/head
David Baker 2015-07-16 16:53:27 +01:00
parent 3a6423dd0a e6260987cc
commit 75f8363be0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/templates/Login.js
View File

@ -52,7 +52,7 @@ module.exports = {
var cli = MatrixClientPeg.get(); var cli = MatrixClientPeg.get();
this.setState({busy: true}); this.setState({busy: true});
var that = this; var that = this;
cli.loginFlows().then(function(result) { cli.loginFlows().done(function(result) {
that.setState({ that.setState({
flows: result.flows, flows: result.flows,
currentStep: 1, currentStep: 1,