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

This commit is contained in:
David Baker 2017-11-03 14:39:52 +00:00
commit 49ee78dab1
5 changed files with 30 additions and 16 deletions

View file

@ -326,6 +326,7 @@
"Drop here to tag %(section)s": "Drop here to tag %(section)s",
"Press <StartChatButton> to start a chat with someone": "Press <StartChatButton> to start a chat with someone",
"You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory",
"Community Invites": "Community Invites",
"Invites": "Invites",
"Favourites": "Favourites",
"People": "People",