Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' into greenkeeper/eslint-5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Fredrik Folkesson committed Jun 25, 2018
2 parents 0f9e4f8 + 0484ae0 commit 6f1c401
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -47,7 +47,7 @@
"dredd": "5.1.10",
"eslint": "5.0.0",
"eslint-config-airbnb-base": "12.1.0",
"eslint-plugin-import": "2.12.0",
"eslint-plugin-import": "2.13.0",
"hooks": "0.3.2",
"mock-require": "3.0.2",
"nock": "9.3.3",
Expand Down

0 comments on commit 6f1c401

Please sign in to comment.