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

Merge branch 'signer-rpc' into signer-signing 

Conflicts:
	parity/signer.rs
parents a7dfa83d 50e5c88b
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