keorn 9d61071dd7 Merge branch 'miner-no-ap' into auth-bft		2016-11-17 22:04:07 +00:00
..
light	LES Part 1 (#3322)	2016-11-10 18:30:17 +01:00
res	Merge remote-tracking branch 'parity/master' into bft	2016-11-16 10:29:54 +00:00
src	Merge branch 'miner-no-ap' into auth-bft	2016-11-17 22:04:07 +00:00
build.rs	mixed merge and changes...	2016-10-11 18:37:31 +01:00
Cargo.toml	v1.5 (#3195)	2016-11-04 17:27:11 +01:00