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

Merge branch 'develop' into rav/device_verification

Browse source
This commit is contained in:
Richard van der Hoff 2016-06-08 21:34:47 +01:00
commit 1dfb3f71ae
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/UserSettings.js
View file

@ -31,7 +31,9 @@ module.exports = React.createClass({
propTypes: {
version: React.PropTypes.string,
onClose: React.PropTypes.func
onClose: React.PropTypes.func,
// The brand string given when creating email pushers
brand: React.PropTypes.string,
},
getDefaultProps: function() {
@ -350,7 +352,7 @@ module.exports = React.createClass({
<h3>Notifications</h3>
<div className="mx_UserSettings_section">
<Notifications threepids={this.state.threepids} />
<Notifications threepids={this.state.threepids} brand={this.props.brand} />
</div>
</div>);
}