matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Merge branch 'develop' into travis/granular-settings

Browse Source
This commit is contained in:
Travis Ralston
2017-11-07 14:55:12 -07:00
committed by GitHub
parent 781b94c8f4 8fbe50a1cf
commit 289b0c2b6a
24 changed files with 419 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/LoggedInView.js
View File

@@ -301,6 +301,7 @@ export default React.createClass({
case PageTypes.GroupView:
page_element = <GroupView
groupId={this.props.currentGroupId}
isNew={this.props.currentGroupIsNew}
collapsedRhs={this.props.collapseRhs}
/>;
if (!this.props.collapseRhs) right_panel = <RightPanel groupId={this.props.currentGroupId} disabled={this.props.rightDisabled} />;