Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
aec3c9961c
1 changed files with 0 additions and 2 deletions
|
@ -167,7 +167,6 @@ module.exports = React.createClass({
|
|||
const StartChatButton = sdk.getComponent('elements.StartChatButton');
|
||||
const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
|
||||
const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
|
||||
const GroupsButton = sdk.getComponent('elements.GroupsButton');
|
||||
const SettingsButton = sdk.getComponent('elements.SettingsButton');
|
||||
|
||||
return (
|
||||
|
@ -183,7 +182,6 @@ module.exports = React.createClass({
|
|||
<div ref={this._collectCreateRoomButton}>
|
||||
<CreateRoomButton tooltip={true} />
|
||||
</div>
|
||||
<GroupsButton tooltip={true} />
|
||||
<span className="mx_BottomLeftMenu_settings">
|
||||
<SettingsButton tooltip={true} />
|
||||
</span>
|
||||
|
|
Loading…
Reference in a new issue