summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-26 15:55:32 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-04-26 15:55:32 -0500
commit9cc1294d27d09015bcd1dc73dab187a0f605e22a (patch)
tree139fd8f861ff0d9b4f748144a69418ac2d0b730c /package.json
parent112b977ed3ca47aacbc0412b39adb8882e18839f (diff)
parentc73b5d31e680b175b2592d299c901bdcb43bca9f (diff)
downloadgitlab-ce-9cc1294d27d09015bcd1dc73dab187a0f605e22a.tar.gz
Merge branch 'master' into bootstrap4
Diffstat (limited to 'package.json')
-rw-r--r--package.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json
index 9605a4a5fc2..8e8b9c1ec1e 100644
--- a/package.json
+++ b/package.json
@@ -85,11 +85,11 @@
"underscore": "^1.8.3",
"url-loader": "^0.6.2",
"visibilityjs": "^1.2.4",
- "vue": "^2.5.13",
+ "vue": "^2.5.16",
"vue-loader": "^14.1.1",
- "vue-resource": "^1.3.5",
+ "vue-resource": "^1.5.0",
"vue-router": "^3.0.1",
- "vue-template-compiler": "^2.5.13",
+ "vue-template-compiler": "^2.5.16",
"vue-virtual-scroll-list": "^1.2.5",
"vuex": "^3.0.1",
"webpack": "^3.11.0",