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

Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings

Browse source
This commit is contained in:
Erik Johnston 2015-07-16 10:46:40 +01:00
commit f17a9b14c2
11 changed files with 553 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/organisms/RoomView.js
View file

@ -36,7 +36,7 @@ var tileTypes = {
module.exports = {
getInitialState: function() {
return {
room: MatrixClientPeg.get().getRoom(this.props.roomId),
room: this.props.roomId ? MatrixClientPeg.get().getRoom(this.props.roomId) : null,
messageCap: INITIAL_SIZE
}
},