Merge branch 'develop' into joriks/appearance-advanced

This commit is contained in:
Jorik Schellekens 2020-06-18 14:41:28 +01:00 committed by GitHub
commit 47a825be7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 1086 additions and 163 deletions

View file

@ -66,7 +66,6 @@ export default class LabsUserSettingsTab extends React.Component {
<SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
<SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
<SettingsFlag name={"sendReadReceipts"} level={SettingLevel.ACCOUNT} />
<SettingsFlag name={"keepSecretStoragePassphraseForSession"} level={SettingLevel.DEVICE} />
</div>
</div>
);