Skip to content

Commit

Permalink
Merge branch 'master' into renovate/node-9.x
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielMSchmidt authored Apr 27, 2018
2 parents 22ab4d5 + 7e1b79f commit de295d6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@types/enzyme": "3.1.10",
"@types/jest": "22.2.3",
"@types/node": "9.6.7",
"@types/react": "16.3.12",
"@types/react": "16.3.13",
"@types/react-dom": "16.0.5",
"@types/react-test-renderer": "16.0.1",
"@types/storybook__addon-actions": "3.0.3",
Expand Down

0 comments on commit de295d6

Please sign in to comment.