summaryrefslogtreecommitdiffstats
path: root/apps/oauth2/package.json
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2018-06-20 11:21:11 +0200
committerGitHub <noreply@github.com>2018-06-20 11:21:11 +0200
commit8142ee548c24daeb383290a81aa883bafcb4df25 (patch)
tree9f23b4fca27c2baa5d69229f1c1ac0d7a8ee009e /apps/oauth2/package.json
parent1a1c0e7ac0c2fed58efd4ea0f187149380792e70 (diff)
parentf0316c8b6139b1821f35d8166e702db5cfdbfb64 (diff)
downloadnextcloud-server-8142ee548c24daeb383290a81aa883bafcb4df25.tar.gz
nextcloud-server-8142ee548c24daeb383290a81aa883bafcb4df25.zip
Merge pull request #9928 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-merge-4.1.3
Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/oauth2
Diffstat (limited to 'apps/oauth2/package.json')
-rw-r--r--apps/oauth2/package.json2
1 files changed, 1 insertions, 1 deletions
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"
}
}