Skip to content
Commit 6bbaced3 authored by Tomasz Drwięga's avatar Tomasz Drwięga
Browse files

Merge branch 'master' into miner-no-default 

Conflicts:
	ethcore/src/miner/miner.rs
	parity/main.rs
parents 4ece6834 516b0153
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