Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist

2017-08-30 17:39:47 +01:00 · 2017-08-30 17:39:47 +01:00 · 9efa604706
commit 9efa604706
parent cf747fcb57 32b33c66b9
28 changed files with 90 additions and 65 deletions
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@ -571,6 +571,7 @@ module.exports = React.createClass({
                             label={ _t('Invites') }
                             editable={ false }
                             order="recent"
+                             isInvite={true}
                             selectedRoom={ self.props.selectedRoom }
                             incomingCall={ self.state.incomingCall }
                             collapsed={ self.props.collapsed }