Merge branch 'master' into 2.3.0

This commit is contained in:
Pooya Parsa 2017-04-30 01:27:05 +04:30 committed by GitHub
commit 2d7a0874f0
1 changed files with 3 additions and 3 deletions

View File

@ -81,13 +81,13 @@
"serialize-javascript": "^1.3.0", "serialize-javascript": "^1.3.0",
"serve-static": "^1.12.2", "serve-static": "^1.12.2",
"url-loader": "^0.5.8", "url-loader": "^0.5.8",
"vue": "^2.3.0", "vue": "~2.3.0",
"vue-loader": "^12.0.2", "vue-loader": "^12.0.2",
"vue-meta": "^0.5.6", "vue-meta": "^0.5.6",
"vue-router": "^2.5.2", "vue-router": "^2.5.2",
"vue-server-renderer": "^2.3.0", "vue-server-renderer": "~2.3.0",
"vue-ssr-html-stream": "^2.2.0", "vue-ssr-html-stream": "^2.2.0",
"vue-template-compiler": "^2.3.0", "vue-template-compiler": "~2.3.0",
"vuex": "^2.3.1", "vuex": "^2.3.1",
"webpack": "^2.4.1", "webpack": "^2.4.1",
"webpack-bundle-analyzer": "^2.4.0", "webpack-bundle-analyzer": "^2.4.0",