Skip to content
This repository has been archived by the owner on Mar 30, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' into greenkeeper/@kadira/react-storybook-addon-…
Browse files Browse the repository at this point in the history
…info-3.4.0
  • Loading branch information
stipsan committed Mar 27, 2017
2 parents 3be6851 + 613d9fc commit 01a774b
Show file tree
Hide file tree
Showing 4 changed files with 858 additions and 850 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ language: node_js
node_js:
- "node"
cache: yarn
before_install: "bash <(curl -sL https://gist.github.com/stipsan/e69536d1a22c08e6e4feb4e14844face/raw/)"
before_script: "node guard.js"
script: "yarn test -- --coverage && yarn lint"
after_script: "yarn coveralls"
after_success: "bash yarn.sh"
notifications:
email: false
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@kadira/storybook": "2.35.3",
"@kadira/storybook-deployer": "1.2.0",
"autoprefixer": "6.7.7",
"babel-cli": "6.23.0",
"babel-cli": "6.24.0",
"babel-core": "6.24.0",
"babel-eslint": "7.2.1",
"babel-jest": "19.0.0",
Expand Down Expand Up @@ -94,7 +94,7 @@
"react-test-renderer": "15.4.2",
"semver": "^5.3.0",
"semver-truncate": "^1.1.2",
"style-loader": "0.15.0",
"style-loader": "0.16.0",
"uikit": "2.27.2",
"url-loader": "0.5.8"
},
Expand Down

0 comments on commit 01a774b

Please sign in to comment.