1
0
mirror of https://github.com/bitwarden/browser synced 2026-01-09 03:53:53 +00:00

Merge branch 'master' of https://github.com/bitwarden/browser into feature/desktop-bridge

# Conflicts:
#	src/_locales/en/messages.json
This commit is contained in:
Hinton
2020-11-16 10:07:54 +01:00
58 changed files with 2446 additions and 187 deletions

View File

@@ -119,6 +119,9 @@
"default": "Ctrl+Shift+9"
},
"description": "__MSG_commandGeneratePasswordDesc__"
},
"lock_vault": {
"description": "__MSG_commandLockVaultDesc__"
}
},
"web_accessible_resources": [