1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-15 07:54:55 +00:00

resolve merge conflicts

This commit is contained in:
William Martin
2024-07-25 13:54:06 -04:00
215 changed files with 4255 additions and 10070 deletions

View File

@@ -66,7 +66,7 @@
"form-data": "4.0.0",
"https-proxy-agent": "7.0.2",
"inquirer": "8.2.6",
"jsdom": "23.0.1",
"jsdom": "24.1.1",
"jszip": "3.10.1",
"koa": "2.15.0",
"koa-bodyparser": "4.4.1",