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

Merge branch 'master' into tx_queue_timeout 

Conflicts:
	ethcore/src/client/test_client.rs
	miner/src/miner.rs
parents 0dc1ddef 2309e19f
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