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
..
v1	Merge branch 'master' into rotating-key	2016-12-14 14:10:44 +01:00
lib.rs	Altering the order [ci:skip]	2016-12-13 14:59:19 +01:00