matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Merge branch 'develop' into dbkr/group_userlist

Browse Source
This commit is contained in:
Luke Barnard
2017-09-19 13:26:55 +01:00
parent 3c3328c5f1 658285ebbf
commit e9fb5712bd
51 changed files with 890 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/MatrixChat.js
View File

@@ -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) {