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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets

Browse Source 
 Conflicts:
	src/components/views/elements/AppTile.js
This commit is contained in:
Michael Telatynski
2020-10-21 12:48:51 +01:00
parent 568e147053 fb3b5d2f5d
commit 4e12aeca9e
60 changed files with 1357 additions and 1128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/LeftPanel.tsx
View File

@@ -398,7 +398,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
const roomList = <RoomList
onKeyDown={this.onKeyDown}
resizeNotifier={null}
collapsed={false}
onFocus={this.onFocus}
onBlur={this.onBlur}
isMinimized={this.props.isMinimized}