Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/chrome-launcher-0.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
axelssonHakan committed Jan 10, 2018
2 parents 42d068a + c1b0ab8 commit a24163d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 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
Expand Up @@ -55,7 +55,7 @@
"yargs": "10.0.3"
},
"devDependencies": {
"@types/chai": "4.0.10",
"@types/chai": "4.1.0",
"@types/mocha": "2.2.46",
"babel-core": "6.26.0",
"babel-plugin-istanbul": "4.1.5",
Expand Down

0 comments on commit a24163d

Please sign in to comment.