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

Merge remote-tracking branch 'origin/master' into release/3.3

Browse Source 
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
This commit is contained in:
hypnos 2017-10-23 22:58:02 +03:00
commit 0b949998f7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/graphql/package.json
View File

@ -22,7 +22,7 @@
},
"dependencies": {
"global": "^4.3.2",
"graphiql": "^0.11.5",
"graphiql": "^0.11.6",
"graphql": "^0.11.7",
"prop-types": "^15.6.0"
},

6
yarn.lock
View File

@ -5981,9 +5981,9 @@ graceful-fs@4.1.11, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3,
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
graphiql@^0.11.5:
version "0.11.5"
resolved "https://registry.yarnpkg.com/graphiql/-/graphiql-0.11.5.tgz#0924c934d035c69eddfbbae30d3e59e46e29afc9"
graphiql@^0.11.6:
version "0.11.6"
resolved "https://registry.yarnpkg.com/graphiql/-/graphiql-0.11.6.tgz#5d24d3609c9dd7c8a24306f76d8402899a9dc5e0"
dependencies:
codemirror "^5.26.0"
codemirror-graphql "^0.6.11"