ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #493 from nextcloud/dependabot/npm_and_yarn/js/webpack-merge-4.1.3

Browse Source 
Bump webpack-merge from 4.1.2 to 4.1.3 in /js
This commit is contained in:
Julius Härtl
2018-06-19 15:02:31 +02:00
committed by GitHub
parent 8f5d0c3f76 77b906e884
commit e4863b6d8d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/package-lock.json generated
View File

@@ -9349,9 +9349,9 @@
} }
}, },
"webpack-merge": { "webpack-merge": {
"version": "4.1.2", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz",
"integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==", "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.5" "lodash": "^4.17.5"

2
js/package.json
View File

@@ -26,7 +26,7 @@
"node-sass": "^4.5.3", "node-sass": "^4.5.3",
"webpack": "^4.12.0", "webpack": "^4.12.0",
"webpack-cli": "^3.0.8", "webpack-cli": "^3.0.8",
"webpack-merge": "^4.1.2", "webpack-merge": "^4.1.3",
"karma": "^2.0.3" "karma": "^2.0.3"
}, },
"scripts": { "scripts": {