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

Merge branch 'master' into updating_clippy 

Conflicts:
	ethcore/src/lib.rs
	sync/src/chain.rs
	sync/src/lib.rs
	util/src/keys/store.rs
	util/src/lib.rs
parents 8709dd28 c9f5a9bc
Expand all 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