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

Merge branch 'develop' into kegan/archived-rooms

Browse source
This commit is contained in:
Kegan Dougal 2015-12-17 17:07:18 +00:00
commit 8e4d0c0be7
7 changed files with 111 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/RoomList.js
View file

@ -265,7 +265,7 @@ module.exports = React.createClass({
collapsed={ self.props.collapsed } />
<RoomSubList list={ self.state.lists['im.vector.fake.recent'] }
label="Conversations"
label="Rooms"
editable={ true }
verb="restore"
order="recent"