Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-11 16:08:33 +00:00
commit 25a1dccffc

View file

@ -302,7 +302,7 @@ module.exports = React.createClass({
} : {}; } : {};
return this._matrixClient.register( return this._matrixClient.register(
this.state.formVals.username.toLowerCase(), this.state.formVals.username,
this.state.formVals.password, this.state.formVals.password,
undefined, // session id: included in the auth dict already undefined, // session id: included in the auth dict already
auth, auth,