Merge branch 'experimental' into travis/settings/positive

2019-01-28 08:25:40 -07:00
parent e1bc1eee43 55e0838c82
commit a1e3887a74
50 changed files with 2044 additions and 873 deletions
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -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} />