matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Travis Ralston
2021-03-09 09:33:19 -07:00
parent 41576954fd eb45731d2e
commit 5b3367d44e
24 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/dialogs/UserSettingsDialog.js
View File

@@ -157,7 +157,7 @@ export default class UserSettingsDialog extends React.Component {
return (
<BaseDialog className='mx_UserSettingsDialog' hasCancel={true}
onFinished={this.props.onFinished} title={_t("Settings")}>
<div className='ms_SettingsDialog_content'>
<div className='mx_SettingsDialog_content'>
<TabbedView tabs={this._getTabs()} initialTabId={this.props.initialTabId} />
</div>
</BaseDialog>