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

Merge branch 'master' into signer-rpc 

Conflicts:
	dapps/src/lib.rs
	parity/main.rs
	parity/signer.rs
	signer/Cargo.toml
	signer/src/lib.rs
parents 50e5c88b 87d0f09a
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