Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/globby-8.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
axelssonHakan committed Feb 20, 2018
2 parents bc97ec3 + 0071485 commit 5966e66
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 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.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -39,7 +39,7 @@
"highlight.js": "9.12.0",
"import-cwd": "2.1.0",
"jimp": "0.2.28",
"koa": "2.4.1",
"koa": "2.5.0",
"koa-favicon": "2.0.0",
"koa-rewrite": "3.0.0",
"koa-static": "4.0.2",
Expand All @@ -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 5966e66

Please sign in to comment.