matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist

Browse Source
This commit is contained in:
David Baker
2017-08-15 10:49:07 +01:00
parent 4daf9064d9 004cc42cfc
commit 64f352dda7
50 changed files with 356 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,7 +301,7 @@ export default React.createClass({
case PageTypes.UserView:
page_element = null; // deliberately null for now
right_panel = <RightPanel userId={this.props.viewUserId} opacity={this.props.rightOpacity} />;
right_panel = <RightPanel opacity={this.props.rightOpacity} />;
break;
case PageTypes.GroupView:
page_element = <GroupView