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

Merge branch 'master' into coverage-effort 

Conflicts:
	ethcore/res/ethereum/tests
parents 56511920 122e1ff9
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