Merge branch 'develop' into dbkr/group_userlist

2017-09-19 13:26:55 +01:00 · 2017-09-19 13:26:55 +01:00 · e9fb5712bd
commit e9fb5712bd
parent 3c3328c5f1 658285ebbf
51 changed files with 890 additions and 333 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@ -672,7 +672,6 @@ module.exports = React.createClass({
            page_type: PageTypes.RoomView,
            thirdPartyInvite: roomInfo.third_party_invite,
            roomOobData: roomInfo.oob_data,
-            autoJoin: roomInfo.auto_join,
        };

        if (roomInfo.room_alias) {