1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-22 18:41:57 +03:00

Merge branch 'experimental' into travis/settings/positive

This commit is contained in:
Travis Ralston
2019-01-28 08:25:40 -07:00
committed by GitHub
50 changed files with 2044 additions and 873 deletions

View File

@ -212,6 +212,7 @@ const LeftPanel = React.createClass({
<CallPreview ConferenceHandler={VectorConferenceHandler} />
<RoomList
ref={this.collectRoomList}
toolbarShown={this.props.toolbarShown}
collapsed={this.props.collapsed}
searchFilter={this.state.searchFilter}
ConferenceHandler={VectorConferenceHandler} />