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

merge develop

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-17 23:31:21 +00:00
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
}
},