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

Merge branch 'master' into miner-spec-refact 

Conflicts:
	ethcore/build.rs
parents 8cc321fe 4e41cbca
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