Skip to content

Commit

Permalink
Merge branch 'master' into 42-add-recommended-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
terales committed Dec 31, 2017
2 parents 77824df + 562deb1 commit e79610f
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 @@ -23,7 +23,7 @@
"codacy-coverage": "2.0.3",
"coveralls": "3.0.0",
"jpeg-js": "0.3.3",
"nodemon": "1.14.6",
"nodemon": "1.14.7",
"nyc": "11.4.1",
"pixelmatch": "4.0.2",
"rimraf": "2.6.2",
Expand Down

0 comments on commit e79610f

Please sign in to comment.