matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-12 12:41:46 +03:00
Code Activity

Merge commit '9a0ea56' into rav/roomview_works

Browse Source 
Conflicts:
	src/components/structures/RoomView.js
This commit is contained in:
Richard van der Hoff
2016-02-23 13:02:02 +00:00
parent b1093f3f4b 9a0ea56bba
commit 776b6a26c3
3 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/RoomView.js
View File

@ -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 }
/>);