Merge branch 'master' into serdeup

2017-07-06 11:43:46 +02:00
parent 61d8f90530 46183b1cdd
commit 1c2a4c116a
33 changed files with 1658 additions and 95 deletions
--- a/ethkey/cli/Cargo.toml
+++ b/ethkey/cli/Cargo.toml
@@ -7,8 +7,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 ethkey = { path = "../" }
 serde = "1.0"
 serde_derive = "1.0"
-rustc-hex = "1.0"
 docopt = "0.8"
+rustc-hex = "1.0"

 [[bin]]
 name = "ethkey"