Merge commit '9a0ea56' into rav/roomview_works

Conflicts: src/components/structures/RoomView.js
2016-02-23 13:02:02 +00:00 · 2016-02-23 13:02:02 +00:00 · 776b6a26c3
commit 776b6a26c3
parent b1093f3f4b 9a0ea56bba
3 changed files with 0 additions and 28 deletions
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@ -1265,9 +1265,6 @@ module.exports = React.createClass({
                highlightedEventId={this.props.highlightedEventId}
                eventId={this.props.eventId}
                eventPixelOffset={this.props.eventPixelOffset}
-                isConferenceUser={this.props.ConferenceHandler ?
-                                  this.props.ConferenceHandler.isConferenceUser :
-                                  null }
                onScroll={ this.onMessageListScroll }
            />);