Merge pull request #1327 from matrix-org/matthew/multiple-widgets

Matthew/multiple widgets
This commit is contained in:
Richard Lewis 2017-08-22 10:53:51 +01:00 committed by GitHub
commit 502a0480a0
3 changed files with 7 additions and 3 deletions

View file

@ -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 }