Merge branch 'zcash-2.0.1'

This commit is contained in:
Jack Grigg
2018-10-11 20:57:50 +01:00
5 changed files with 126 additions and 6 deletions

1
Cargo.lock generated
View File

@@ -344,6 +344,7 @@ dependencies = [
"pairing 0.14.2",
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"sapling-crypto 0.0.1",
"zip32 0.0.0",
]
[[package]]