Skip to content
Commit 9ca938f7 authored by keorn's avatar keorn
Browse files

Merge remote-tracking branch 'parity/master' into bft 

Conflicts:
	ethcore/src/client/client.rs
	sync/src/api.rs
parents 8a51ae02 443eb197
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