summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-05-22 17:20:57 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-05-22 17:20:57 -0500
commit6dd13180ccbfecb0038510fa55808dda5952342f (patch)
treec22ef069b82d2b1879b2151291017c13175649ae /package.json
parent601c485cbc7d3d5bd37028d93a42e1e662d3709f (diff)
parent76e276cb433a7023cf8154f9d9555725b3b11e67 (diff)
downloadgitlab-ce-6dd13180ccbfecb0038510fa55808dda5952342f.tar.gz
Merge branch 'master' into bootstrap4
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 83539c269b7..a0441e96fb5 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
"url-loader": "^1.0.1",
"visibilityjs": "^1.2.4",
"vue": "^2.5.16",
- "vue-loader": "^14.1.1",
+ "vue-loader": "^15.0.12",
"vue-resource": "^1.5.0",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.16",