Merge branch 'develop' into matthew/status

This commit is contained in:
Matthew Hodgson 2017-11-11 23:50:48 +00:00 committed by GitHub
commit 46387e135e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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