Nikolay Volf 3b21a5f54c Merge branch 'master' into rpc-signing-extend ... Conflicts: parity/main.rs		2016-03-10 19:08:41 +04:00
..
src	Merge branch 'master' into rpc-signing-extend	2016-03-10 19:08:41 +04:00
build.rs	Fixing clippy warnings. When building on nightly it is required to enable clippy	2016-03-07 14:34:17 +01:00
Cargo.toml	Merge branch 'master' into clippy-dev	2016-03-10 02:45:53 +04:00