From f0316c8b6139b1821f35d8166e702db5cfdbfb64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Wed, 20 Jun 2018 08:40:45 +0000
Subject: [PATCH] Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/oauth2
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v4.1.2...v4.1.3)
Signed-off-by: dependabot[bot] <support@dependabot.com>
---
apps/oauth2/package-lock.json | 6 +++---
apps/oauth2/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/oauth2/package-lock.json b/apps/oauth2/package-lock.json
index b6e7b229aa3..f7e53c59a96 100644
--- a/apps/oauth2/package-lock.json
+++ b/apps/oauth2/package-lock.json
@@ -5497,9 +5497,9 @@
}
},
"webpack-merge": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz",
- "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==",
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz",
+ "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==",
"dev": true,
"requires": {
"lodash": "^4.17.5"
diff --git a/apps/oauth2/package.json b/apps/oauth2/package.json
index 9934b98c45e..b9eba746a00 100644
--- a/apps/oauth2/package.json
+++ b/apps/oauth2/package.json
@@ -26,6 +26,6 @@
"vue-template-compiler": "^2.5.16",
"webpack": "^4.11.1",
"webpack-cli": "^3.0.3",
- "webpack-merge": "^4.1.2"
+ "webpack-merge": "^4.1.3"
}
}
--
GitLab