Jaco Greeff 3d24ae0981 Merge branch 'master' into ui-2		2017-07-10 17:36:55 +02:00
..
light	Proper light client informant and more verification of imported headers (#5897)	2017-07-10 13:21:11 +02:00
native_contracts	updated serde to version 1.0	2017-07-06 11:36:15 +02:00
res	Merge branch 'master' into ui-2	2017-07-10 17:36:55 +02:00
src	--reseal-on-uncle (#5940)	2017-07-10 13:36:42 +02:00
build.rs	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
Cargo.toml	updated serde to version 1.0	2017-07-06 11:36:15 +02:00