Merge pull request #95 from silverstripe/dependabot/npm_and_yarn/merge-1.2.1

This commit is contained in:
dependabot[bot] 2021-05-14 11:05:41 +00:00 committed by GitHub
commit 05958a9e99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3802,8 +3802,8 @@ meow@^3.7.0:
trim-newlines "^1.0.0"
merge@^1.1.3, merge@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
version "1.2.1"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
micromatch@^2.1.5, micromatch@^2.3.11:
version "2.3.11"