Merge branch 'develop' into travis/cross-sign-setting

This commit is contained in:
Travis Ralston 2020-04-16 11:06:26 -06:00
commit db749519e7
18 changed files with 226 additions and 176 deletions

View file

@ -516,7 +516,7 @@ export const SETTINGS = {
},
"keepSecretStoragePassphraseForSession": {
supportedLevels: ['device', 'config'],
displayName: _td("Keep secret storage passphrase in memory for this session"),
displayName: _td("Keep recovery passphrase in memory for this session"),
default: false,
},
"crawlerSleepTime": {