Merge branch 'master' into dependabot/npm_and_yarn/globby-11.0.0

This commit is contained in:
David Díaz 2020-05-08 17:17:12 -06:00 committed by GitHub
commit 2c478231a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View File

@ -2128,9 +2128,9 @@
"dev": true
},
"deepmerge": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.1.1.tgz",
"integrity": "sha512-+qO5WbNBKBaZez95TffdUDnGIo4+r5kmsX8aOb7PDHvXsTbghAmleuxjs6ytNaf5Eg4FGBXDS5vqO61TRi6BMg=="
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
},
"defer-to-connect": {
"version": "1.1.3",

View File

@ -22,7 +22,7 @@
"beau-std": "0.9.4",
"cli-color": "2.0.0",
"clui": "0.3.6",
"deepmerge": "4.1.1",
"deepmerge": "4.2.2",
"dotenv": "8.2.0",
"globby": "11.0.0",
"is-plain-object": "3.0.0",