Skip to content
Commit 6e7b003e authored by Arkadiy Paronyan's avatar Arkadiy Paronyan
Browse files

Merge branch 'fixmining' of github.com:ethcore/parity into beta

parents 0de297ad 29b6ba4a
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