Tomasz Drwięga 7eb9112613 Merge branch 'master' into rotating-key ...

Conflicts:
	rpc/src/v1/traits/signer.rs

2016-12-14 14:10:44 +01:00

..

mod.rs

Rename ethcore -> parity in license.

2016-12-11 19:30:54 +01:00

transient_dir.rs

Merge branch 'master' into rotating-key

2016-12-14 14:10:44 +01:00