Tomasz Drwięga 555555e6f7 Merge branch 'master' into signer-wsnotification ... Conflicts: parity/signer.rs rpc/src/v1/helpers/signing_queue.rs rpc/src/v1/impls/eth_signing.rs rpc/src/v1/impls/personal_signer.rs signer/src/ws_server/mod.rs		2016-06-01 20:00:43 +02:00
..
v1	Merge branch 'master' into signer-wsnotification	2016-06-01 20:00:43 +02:00
lib.rs	Simple signing queue, confirmation APIs exposed in signer WebSockets. (#1182)	2016-06-01 19:37:34 +02:00