Merge pull request #1327 from matrix-org/matthew/multiple-widgets
Matthew/multiple widgets
This commit is contained in:
commit
502a0480a0
3 changed files with 7 additions and 3 deletions
|
@ -139,7 +139,7 @@ module.exports = React.createClass({
|
|||
}
|
||||
|
||||
return (
|
||||
<div className={ appsDrawer ? "mx_RoomView_auxPanel mx_RoomView_auxPanel_apps" : "mx_RoomView_auxPanel" } style={{maxHeight: this.props.maxHeight}} >
|
||||
<div className="mx_RoomView_auxPanel" style={{maxHeight: this.props.maxHeight}} >
|
||||
{ appsDrawer }
|
||||
{ fileDropTarget }
|
||||
{ callView }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue