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

Merge branch 'signer-server' into signer-rpc 

Conflicts:
	parity/signer.rs
	signer/Cargo.toml
	signer/src/lib.rs
	signer/src/ws_server/mod.rs
parents c4e2f650 f60097dd
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