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

Merge branch 'master' into ethminer_crate 

Conflicts:
	ethcore/src/client/client.rs
	parity/main.rs
	sync/src/chain.rs
	sync/src/lib.rs
parents 9f19d299 c9f5a9bc
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