grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'parity/master' into bft

Browse Source 
Conflicts:
	Cargo.lock
This commit is contained in:
keorn
2016-09-27 12:37:43 +02:00
parent 9fe62d9750 bc4cbaac2b
commit fd6900bbb3
168 changed files with 5255 additions and 2166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json/Cargo.toml
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.85", optional = true}
clippy = { version = "0.0.90", optional = true}
[build-dependencies]
serde_codegen = { version = "0.8", optional = true }