Merge branch 'develop' into joriks/appearance-advanced

2020-06-18 14:41:28 +01:00
parent 045217ee8d 27a9a7b4c1
commit 47a825be7c
58 changed files with 1086 additions and 163 deletions
@@ -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>
        );