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

Commit

Permalink
Merge branch 'master' into v3.38-release
Browse files Browse the repository at this point in the history
  • Loading branch information
Thore3 committed Oct 6, 2017
2 parents f00fd02 + 9e29f10 commit df7f53e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"bigi": "1.4.*",
"bignumber.js": "^4.0.2",
"bip39": "2.1.*",
"bitcoin-coinify-client": "^0.6.5",
"bitcoin-exchange-client": "^0.4.3",
"bitcoin-coinify-client": "^0.6.9",
"bitcoin-exchange-client": "^0.4.6",
"bitcoin-sfox-client": "^0.1.11",
"bitcoin-unocoin-client": "^0.3.4",
"bitcoincashjs-lib": "https://github.com/bitcoinjs/bitcoinjs-lib#9ac221c80dbc3462d7a2392cec2045ae2b590461",
Expand Down
16 changes: 11 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1021,22 +1021,28 @@ bip66@^1.1.0, bip66@^1.1.3:
dependencies:
safe-buffer "^5.0.1"

bitcoin-coinify-client@^0.6.5:
version "0.6.5"
resolved "https://registry.npmjs.org/bitcoin-coinify-client/-/bitcoin-coinify-client-0.6.5.tgz#06e977a1cbc68dcd659198f8a21c7827b0f0c8d7"
bitcoin-coinify-client@^0.6.9:
version "0.6.9"
resolved "https://registry.npmjs.org/bitcoin-coinify-client/-/bitcoin-coinify-client-0.6.9.tgz#933458ce5161262112cea4e29cdc94cb2f66c8de"
dependencies:
babel-polyfill "6.16.*"
babel-preset-es2015 "6.16.*"
babelify "7.3.*"
bitcoin-exchange-client "~0.4.0"
bitcoin-exchange-client "^0.4.6"

[email protected].*:
version "0.2.2"
resolved "https://registry.yarnpkg.com/bitcoin-exchange-client/-/bitcoin-exchange-client-0.2.2.tgz#8d5370a3ac20a0d3fc75e8a3d76bbc285a35f7ec"
dependencies:
isomorphic-fetch "^2.2.0"

bitcoin-exchange-client@^0.4.3, bitcoin-exchange-client@~0.4.0, bitcoin-exchange-client@~0.4.1:
bitcoin-exchange-client@^0.4.6:
version "0.4.6"
resolved "https://registry.npmjs.org/bitcoin-exchange-client/-/bitcoin-exchange-client-0.4.6.tgz#46ae8eff5275fe49df4b6c6ee01252e8b6e0e224"
dependencies:
isomorphic-fetch "^2.2.0"

bitcoin-exchange-client@~0.4.1:
version "0.4.3"
resolved "https://registry.yarnpkg.com/bitcoin-exchange-client/-/bitcoin-exchange-client-0.4.3.tgz#f2d2121a36eb9d1d18a504c1397987bfa39d7ddb"
dependencies:
Expand Down

0 comments on commit df7f53e

Please sign in to comment.