summaryrefslogtreecommitdiffstats
path: root/apps/oauth2
diff options
context:
space:
mode:
authordependabot[bot] <support@dependabot.com>2018-12-10 02:19:45 +0000
committerdependabot[bot] <support@dependabot.com>2018-12-10 02:19:45 +0000
commit7c696bd512ba8aaa19d4b383840868322b802fc8 (patch)
treeabb7919c40a3f541e6ab0d4491555b90d6170226 /apps/oauth2
parent386875cabe0fbc1a44efe7dd64dbc04ad43243d0 (diff)
downloadnextcloud-server-7c696bd512ba8aaa19d4b383840868322b802fc8.tar.gz
nextcloud-server-7c696bd512ba8aaa19d4b383840868322b802fc8.zip
Bump webpack-merge from 4.1.4 to 4.1.5 in /apps/oauth2
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5. - [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/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
Diffstat (limited to 'apps/oauth2')
-rw-r--r--apps/oauth2/package-lock.json12
-rw-r--r--apps/oauth2/package.json2
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/oauth2/package-lock.json b/apps/oauth2/package-lock.json
index 37d4afc1f86..31f769c86bf 100644
--- a/apps/oauth2/package-lock.json
+++ b/apps/oauth2/package-lock.json
@@ -2593,9 +2593,9 @@
}
},
"lodash": {
- "version": "4.17.10",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
- "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+ "version": "4.17.11",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
"dev": true
},
"lodash.debounce": {
@@ -4395,9 +4395,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"
diff --git a/apps/oauth2/package.json b/apps/oauth2/package.json
index fe8da421d60..b371ef621d0 100644
--- a/apps/oauth2/package.json
+++ b/apps/oauth2/package.json
@@ -26,6 +26,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"
}
}