Merge remote-tracking branch 'origin/develop' into develop
commit
aec3c9961c
|
@ -167,7 +167,6 @@ module.exports = React.createClass({
|
||||||
const StartChatButton = sdk.getComponent('elements.StartChatButton');
|
const StartChatButton = sdk.getComponent('elements.StartChatButton');
|
||||||
const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
|
const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
|
||||||
const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
|
const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
|
||||||
const GroupsButton = sdk.getComponent('elements.GroupsButton');
|
|
||||||
const SettingsButton = sdk.getComponent('elements.SettingsButton');
|
const SettingsButton = sdk.getComponent('elements.SettingsButton');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -183,7 +182,6 @@ module.exports = React.createClass({
|
||||||
<div ref={this._collectCreateRoomButton}>
|
<div ref={this._collectCreateRoomButton}>
|
||||||
<CreateRoomButton tooltip={true} />
|
<CreateRoomButton tooltip={true} />
|
||||||
</div>
|
</div>
|
||||||
<GroupsButton tooltip={true} />
|
|
||||||
<span className="mx_BottomLeftMenu_settings">
|
<span className="mx_BottomLeftMenu_settings">
|
||||||
<SettingsButton tooltip={true} />
|
<SettingsButton tooltip={true} />
|
||||||
</span>
|
</span>
|
||||||
|
|
Loading…
Reference in New Issue