Nikolay Volf 028434f93d Merge branch 'master' into issue-test/568 ...

Conflicts:
	ethcore/src/tests/client.rs

2016-03-02 17:15:09 +03:00

..

res

Update tests. Fix our tests.

2016-03-01 20:02:59 +01:00

src

Merge branch 'master' into issue-test/568

2016-03-02 17:15:09 +03:00

Cargo.toml

Merge branch 'master' of github.com:ethcore/parity into db

2016-02-24 21:32:21 +01:00