Merge branch 'develop' into matthew/redesign

This commit is contained in:
Matthew Hodgson 2015-10-23 11:25:20 +01:00
commit baf777a418
4 changed files with 17 additions and 8 deletions

View file

@ -114,7 +114,9 @@ module.exports = React.createClass({
</div>
);
}
sender = <SenderProfile mxEvent={this.props.mxEvent} aux={aux} />;
if (EventTileType.needsSenderProfile()) {
sender = <SenderProfile mxEvent={this.props.mxEvent} aux={aux} />;
}
}
return (
<div className={classes}>