matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-12-01 09:58:03 +03:00
Code Activity

Merge branch 'develop' into improved-forwarding-ui

Browse Source
This commit is contained in:
Robin Townsend
2021-05-16 08:13:59 -04:00
parent 7efbd2d930 b06514273f
commit 64e828d069
106 changed files with 2884 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1895,7 +1895,7 @@ export default class RoomView extends React.Component<IProps, IState> {
);
}
if (SettingsStore.getValue("feature_spaces") && this.state.room?.isSpaceRoom()) {
if (this.state.room?.isSpaceRoom()) {
return <SpaceRoomView
space={this.state.room}
justCreatedOpts={this.props.justCreatedOpts}