Merge remote-tracking branch 'exrook/master' into develop

This commit is contained in:
Isis Lovecruft 2018-01-25 20:48:26 +00:00
commit bc9faa4186
Failed to extract signature

View file

@ -28,7 +28,7 @@ optional = true
version = "0.4" version = "0.4"
[dependencies.digest] [dependencies.digest]
version = "0.6" version = "^0.7"
[dependencies.generic-array] [dependencies.generic-array]
# same version that digest depends on # same version that digest depends on
@ -39,7 +39,7 @@ version = "^1.0"
optional = true optional = true
[dependencies.sha2] [dependencies.sha2]
version = "0.6" version = "^0.7"
optional = true optional = true
[dependencies.failure] [dependencies.failure]
@ -47,8 +47,8 @@ version = "^0.1.1"
default-features = false default-features = false
[dev-dependencies] [dev-dependencies]
hex = "0.3" hex = "^0.3"
sha2 = "0.6" sha2 = "^0.7"
bincode = "^0.9" bincode = "^0.9"
[features] [features]