merge develop

This commit is contained in:
Matthew Hodgson 2015-10-27 23:28:34 +00:00
parent aac00db16b
commit cbaf134625
17 changed files with 30 additions and 54 deletions

View file

@ -63,6 +63,7 @@ module.exports = {
MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
MatrixClientPeg.get().removeListener("RoomMember.typing", this.onRoomMemberTyping);
MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
}
},