1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00

Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps

This commit is contained in:
Travis Ralston
2021-03-09 09:33:19 -07:00
24 changed files with 73 additions and 65 deletions

View File

@@ -118,7 +118,7 @@ export default class RoomSettingsDialog extends React.Component {
return (
<BaseDialog className='mx_RoomSettingsDialog' hasCancel={true}
onFinished={this.props.onFinished} title={_t("Room Settings - %(roomName)s", {roomName})}>
<div className='ms_SettingsDialog_content'>
<div className='mx_SettingsDialog_content'>
<TabbedView tabs={this._getTabs()} />
</div>
</BaseDialog>