matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge branch 'matrix-org:develop' into fix/call-search-areas

Browse Source
This commit is contained in:
panoschal
2021-07-24 19:16:10 +03:00
committed by GitHub
parent 153eb05561 869a5fb5c7
commit 05fa90e7e6
145 changed files with 2248 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/RoomView.tsx
View File

@@ -1740,7 +1740,8 @@ export default class RoomView extends React.Component<IProps, IState> {
onJoinClick={this.onJoinButtonClicked}
onForgetClick={this.onForgetClick}
onRejectClick={this.onRejectThreepidInviteButtonClicked}
canPreview={false} error={this.state.roomLoadError}
canPreview={false}
error={this.state.roomLoadError}
roomAlias={roomAlias}
joining={this.state.joining}
inviterName={inviterName}