Merge branch 'develop' into matthew/postcss

2017-01-18 12:52:59 +00:00
parent 8288eb730c 5ef5204c8c
commit a0bbe3a306
6 changed files with 143 additions and 83 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -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}