matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-06-26 04:01:04 +03:00
Code Activity

Merge branch 'develop' into matthew/postcss

Browse Source
This commit is contained in:
Matthew Hodgson
2017-01-18 12:52:59 +00:00
parent 8288eb730c 5ef5204c8c
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}