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

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

Browse Source
This commit is contained in:
Jorik Schellekens
2020-04-28 15:38:46 +01:00
parent eb72245493 cf05beb4b8
commit 1b83faaa8d
51 changed files with 1699 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ export default class UserSettingsDialog extends React.Component {
tabs.push(new Tab(
_td("Security & Privacy"),
"mx_UserSettingsDialog_securityIcon",
<SecurityUserSettingsTab />,
<SecurityUserSettingsTab closeSettingsFn={this.props.onFinished} />,
));
if (SdkConfig.get()['showLabsSettings'] || SettingsStore.getLabsFeatures().length > 0) {
tabs.push(new Tab(