Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/koa-2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
axelssonHakan committed Feb 20, 2018
2 parents a67f155 + 30ced38 commit d51580e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 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 @@ -51,7 +51,7 @@
"sinon": "4.2.2",
"sinon-chai": "2.14.0",
"source-map-support": "0.5.3",
"test-exclude": "4.1.1",
"test-exclude": "4.2.0",
"yargs": "11.0.0"
},
"devDependencies": {
Expand Down

0 comments on commit d51580e

Please sign in to comment.