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

Merge branch 'serde-bump' of github.com:ethcore/parity into serde-bump 

Conflicts:
	Cargo.lock
	dapps/Cargo.toml
	rpc/Cargo.toml
	signer/src/lib.rs
parents 5f68b81f d601e11d
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