Nikolay Volf 8d67316ece Merge branch 'master' into reorgjdb ... Conflicts: parity/main.rs		2016-03-11 17:41:04 +04:00
..
res	Update tests. Fix our tests.	2016-03-01 20:02:59 +01:00
src	Merge branch 'master' into reorgjdb	2016-03-11 17:41:04 +04:00
Cargo.toml	Removing superflous check for nightly	2016-03-11 11:16:49 +01:00