Skip to content
Commit 6c6bbe9c authored by Nikolay Volf's avatar Nikolay Volf
Browse files

Merge branch 'master' into miner-spec-refact 

Conflicts:
	ethcore/src/client/client.rs
	ethcore/src/client/mod.rs
	ethcore/src/client/test_client.rs
	miner/src/miner.rs
parents d424194b 6cff5805
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment