imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into matthew/postcss

Browse source
This commit is contained in:
Matthew Hodgson 2017-01-18 12:52:59 +00:00
commit a0bbe3a306
6 changed files with 143 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/structures/MatrixChat.js
View file

@ -1045,6 +1045,7 @@ module.exports = React.createClass({
defaultHsUrl={this.getDefaultHsUrl()}
defaultIsUrl={this.getDefaultIsUrl()}
brand={this.props.config.brand}
teamsConfig={this.props.config.teamsConfig}
customHsUrl={this.getCurrentHsUrl()}
customIsUrl={this.getCurrentIsUrl()}
registrationUrl={this.props.registrationUrl}