Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/@types/lodash-4.14.106
Browse files Browse the repository at this point in the history
  • Loading branch information
yujiosaka authored Mar 23, 2018
2 parents 2ceb20c + 488b94f commit 18427f3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
"@commitlint/config-conventional": "6.1.3",
"@types/debug": "0.0.30",
"@types/lodash": "4.14.106",
"@types/node": "9.4.7",
"@types/node": "9.6.0",
"@types/puppeteer": "1.2.0",
"@types/request-promise": "4.1.41",
"eslint": "4.19.1",
"eslint-config-airbnb": "16.1.0",
"eslint-plugin-import": "2.9.0",
"greenkeeper-lockfile": "1.14.0",
"mime": "2.2.0",
"mocha": "5.0.3",
"mocha": "5.0.5",
"power-assert": "1.4.4",
"sinon": "5.0.0",
"typescript": "2.7.2"
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@
version "4.14.106"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd"

"@types/node@*", "@types/node@9.4.7":
version "9.4.7"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.7.tgz#57d81cd98719df2c9de118f2d5f3b1120dcd7275"
"@types/node@*", "@types/node@9.6.0":
version "9.6.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"

"@types/[email protected]":
version "1.2.0"
Expand Down Expand Up @@ -1464,9 +1464,9 @@ [email protected], mkdirp@^0.5.1:
dependencies:
minimist "0.0.8"

[email protected].3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.3.tgz#0a95a6ddea9073239851a3a26ffc9c8d679c757a"
[email protected].5:
version "5.0.5"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.5.tgz#e228e3386b9387a4710007a641f127b00be44b52"
dependencies:
browser-stdout "1.3.1"
commander "2.11.0"
Expand Down

0 comments on commit 18427f3

Please sign in to comment.