diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-10-31 10:17:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-31 10:17:31 +0000 |
| commit | 1fd964736f0abf6fb7abfc2fd2ec561138bfa9e6 (patch) | |
| tree | c2cdf4dba121cbc45ea2e4fc63b9b717ca1d0dcb | |
| parent | 7d2c0975f1ef10e66bf1c55ce9039cd73160bfdb (diff) | |
| parent | 283ca372ada340fad530680584850a49a88b53bb (diff) | |
Merge pull request #1102 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.3.0
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json index 66dc5104..c930022f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18737,9 +18737,9 @@ } }, "webpack-merge": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.2.0.tgz", - "integrity": "sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.3.0.tgz", + "integrity": "sha512-4PtsBAWnmJULIJYviiPq4BxwAykbAgGMheyEVaemj2bJI54h+p/gnlbXZEH2EM0IYC3blOE1Qm6kzKlc06N1UQ==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index ec6db39a..8435ef3d 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.44.2", "webpack-cli": "^4.1.0", - "webpack-merge": "^5.2.0" + "webpack-merge": "^5.3.0" }, "jest": { "moduleFileExtensions": [ |