wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #12956 from nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.1.5

Browse source 
Bump webpack-merge from 4.1.4 to 4.1.5 in /settings
This commit is contained in:
John Molakvoæ 2018-12-10 08:26:34 +01:00 committed by GitHub
commit 67af30f04f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
settings/package-lock.json generated
View file

@ -7427,9 +7427,9 @@
}
},
"webpack-merge": {
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz",
"integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz",
"integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==",
"dev": true,
"requires": {
"lodash": "^4.17.5"

2
settings/package.json
View file

@ -43,6 +43,6 @@
"vue-template-compiler": "^2.5.17",
"webpack": "^4.27.1",
"webpack-cli": "^3.1.2",
"webpack-merge": "^4.1.4"
"webpack-merge": "^4.1.5"
}
}