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

This commit is contained in:
Weblate 2017-10-24 14:31:54 +00:00
commit dc7037b4fa

View file

@ -46,6 +46,6 @@ export function groupRoomFromApiObject(apiObject) {
topic: apiObject.topic, topic: apiObject.topic,
numJoinedMembers: apiObject.num_joined_members, numJoinedMembers: apiObject.num_joined_members,
worldReadable: apiObject.world_readable, worldReadable: apiObject.world_readable,
canGuestsJoin: apiObject.can_guests_join, guestCanJoin: apiObject.guest_can_join,
}; };
} }