Merge branch 'master' into serde-bump

Conflicts: ethcore/src/types/state_diff.rs
2016-06-06 10:10:06 +02:00
parent 3ba15f6c64 c8c47ebe32
commit a063a63ac7
118 changed files with 4073 additions and 1850 deletions
--- a/json/src/state/transaction.rs
+++ b/json/src/state/transaction.rs
@@ -40,7 +40,7 @@ pub struct Transaction {
 	/// To.
 	pub to: MaybeEmpty<Address>,
 	/// Value.
-	pub value: Uint
+	pub value: Uint,
 }

 #[cfg(test)]