Merge branch 'master' into auth-bft

This commit is contained in:
keorn
2016-11-30 13:06:21 +00:00
195 changed files with 2555 additions and 1623 deletions

View File

@@ -10,7 +10,7 @@ rustc-serialize = "0.3"
serde = "0.8"
serde_json = "0.8"
serde_macros = { version = "0.8", optional = true }
clippy = { version = "0.0.96", optional = true}
clippy = { version = "0.0.103", optional = true}
[build-dependencies]
serde_codegen = { version = "0.8", optional = true }