Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908

This commit is contained in:
Michael Telatynski 2021-09-10 18:02:48 +01:00
commit ca0d8116ad
10 changed files with 445 additions and 364 deletions

View file

@ -62,7 +62,7 @@ const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFin
SpaceSettingsTab.Visibility,
_td("Visibility"),
"mx_SpaceSettingsDialog_visibilityIcon",
<SpaceSettingsVisibilityTab matrixClient={cli} space={space} />,
<SpaceSettingsVisibilityTab matrixClient={cli} space={space} closeSettingsFn={onFinished} />,
),
new Tab(
SpaceSettingsTab.Roles,