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

Merge branch 'master' into rotating-key

Conflicts:
	ethcore/src/account_provider/mod.rs
	rpc/src/v1/types/mod.rs.in
parents dcb7e1e6 83f791fa
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