Skip to content
Commit 49fba0b5 authored by keorn's avatar keorn
Browse files

Merge branch 'master' into auth-round 

Conflicts:
	ethcore/src/miner/miner.rs
	sync/Cargo.toml
parents ce3e8750 551b5d7b
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