Skip to content

Commit

Permalink
Merge pull request #344 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Aug 16, 2019
2 parents 80b3139 + e7de4fb commit d62c4b0
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"chai": "4.2.0",
"coveralls": "3.0.6",
"eslint": "6.1.0",
"js-gardener": "2.0.65",
"js-gardener": "2.0.66",
"nyc": "14.1.1",
"semantic-release": "15.13.21",
"tmp": "0.1.0"
Expand Down
25 changes: 20 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a"
integrity sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==

"@hapi/bourne@1.x.x":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==

"@hapi/hoek@6.x.x":
version "6.2.4"
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-6.2.4.tgz#4b95fbaccbfba90185690890bdf1a2fbbda10595"
Expand All @@ -205,6 +210,16 @@
"@hapi/marker" "1.x.x"
"@hapi/topo" "3.x.x"

"@hapi/joi@15.1.1":
version "15.1.1"
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
dependencies:
"@hapi/address" "2.x.x"
"@hapi/bourne" "1.x.x"
"@hapi/hoek" "8.x.x"
"@hapi/topo" "3.x.x"

"@hapi/marker@1.x.x":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@hapi/marker/-/marker-1.0.0.tgz#65b0b2b01d1be06304886ce9b4b77b1bfb21a769"
Expand Down Expand Up @@ -3561,12 +3576,12 @@ joi-strict@1.0.5:
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.0.5.tgz#f4abad8bfd39281eb987f8ceb36c76d5d8de30c2"
integrity sha512-ZOU1FTny1MmAlm6vXoD77LFqif23KZQVC9m7euLkYq0QHDj0GHKz/A/IRXzhkk3DPll/Y7A74b1R9M7M4fqzTw==

js-gardener@2.0.65:
version "2.0.65"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.65.tgz#e2e41242ec48e1c93ab320610e12952e71d43a49"
integrity sha512-97VhA/PVGbbUmQ4o6kiZZ/OxRymzK05/OrTBKZr1oB0T2G/l/Tq4ucJoEDefGBHUwCnWRC39ksOlGgHa05QRgg==
js-gardener@2.0.66:
version "2.0.66"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.66.tgz#642e47eaf79fe3c56ea6a9fe867508f5b1b3403f"
integrity sha512-AQ5dpnZdAEOfHIt3RmT2l8YKhnGPHJRsgj4Ssfrl4cHo+whHkDiGjDkyMsv/juqZ5JZz7zpwaG1SISpUcvumXA==
dependencies:
"@hapi/joi" "15.1.0"
"@hapi/joi" "15.1.1"
chalk "2.4.2"
eslint "6.1.0"
eslint-config-airbnb-base "14.0.0"
Expand Down

0 comments on commit d62c4b0

Please sign in to comment.