Skip to content
Commit 1f56588b authored by keorn's avatar keorn
Browse files

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

Conflicts:
	ethcore/src/client/client.rs
parents 096b71fe 1782b659
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