Merge branch 'develop' into germain-gg/fix-right-panel-member
This commit is contained in:
commit
1b8d00d1d4
141 changed files with 6493 additions and 5556 deletions
|
@ -2470,6 +2470,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
|
|||
resizeNotifier={this.props.resizeNotifier}
|
||||
permalinkCreator={this.permalinkCreator}
|
||||
e2eStatus={this.state.e2eStatus}
|
||||
onSearchClick={this.onSearchClick}
|
||||
/>
|
||||
) : undefined;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue