Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/sinon-4.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
axelssonHakan committed Jan 18, 2018
2 parents 1b015b5 + e62c5a2 commit 2e4f53f
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 @@ -50,7 +50,7 @@
"precinct": "4.0.0",
"sinon": "4.1.5",
"sinon-chai": "2.14.0",
"source-map-support": "0.5.0",
"source-map-support": "0.5.1",
"test-exclude": "4.1.1",
"yargs": "10.1.1"
},
Expand Down

0 comments on commit 2e4f53f

Please sign in to comment.