GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 21:41:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/vue-2.5.2-24.0.0-app--vue' into vue-2.5.1-23.0.0-app--vue

Browse Source 
# Conflicts:
#	app/vue/package.json
#	yarn.lock
This commit is contained in:
hypnos 2017-10-15 01:29:28 +03:00
commit 6e2f12c3be
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/vue/package.json
View File

@ -70,7 +70,7 @@
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"vue": "^2.5.1",
"vue": "^2.5.2",
"vue-hot-reload-api": "^2.2.0",
"vue-loader": "^12.2.1",
"vue-style-loader": "^3.0.1",