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

Merge branch 'master' into signer-wsnotification 

Conflicts:
	parity/signer.rs
	rpc/src/v1/helpers/signing_queue.rs
	rpc/src/v1/impls/eth_signing.rs
	rpc/src/v1/impls/personal_signer.rs
	signer/src/ws_server/mod.rs
parents d49152c8 99e26b84
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