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

2017-10-24 14:31:54 +00:00 · 2017-10-24 14:31:54 +00:00 · dc7037b4fa
parent 78f1f5bae8 9e54002983
commit dc7037b4fa
1 changed files with 1 additions and 1 deletions
--- a/src/groups.js
+++ b/src/groups.js
@ -46,6 +46,6 @@ export function groupRoomFromApiObject(apiObject) {
        topic: apiObject.topic,
        numJoinedMembers: apiObject.num_joined_members,
        worldReadable: apiObject.world_readable,
-        canGuestsJoin: apiObject.can_guests_join,
+        guestCanJoin: apiObject.guest_can_join,
    };
 }