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

merge develop

Browse Source
This commit is contained in:
Matthew Hodgson
2016-01-17 23:31:21 +00:00
parent 1467aacfa4 a90f63f72c
commit f3aeda7af9
9 changed files with 219 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ module.exports = React.createClass({
hasUnsentMessages: this._hasUnsentMessages(room),
callState: null,
guestsCanJoin: false,
readMarkerEventId: room ? room.getEventReadUpTo(MatrixClientPeg.get().credentials.userId) : undefined,
readMarkerEventId: room ? room.getEventReadUpTo(MatrixClientPeg.get().credentials.userId) : null,
readMarkerGhostEventId: undefined
}
},