Tomasz Drwięga f60097ddb6 Merge branch 'master' into signer-server ... Conflicts: rpc/src/v1/types/bytes.rs		2016-05-27 18:50:47 +02:00
..
hypervisor	Fixing clippy warnings	2016-05-17 10:32:05 +02:00
cli.rs	WebSockets server for signer	2016-05-27 13:03:00 +02:00
configuration.rs	Bumping clippy. Fixing warnings (#1139)	2016-05-25 17:03:58 +02:00
dapps.rs	have parity create the PersonalClient properly	2016-05-27 16:45:26 +02:00
die.rs	trace error in die_with_io_error	2016-05-22 12:48:40 -04:00
informant.rs	Fixing clippy warnings	2016-05-26 11:49:58 +02:00
io_handler.rs	Display progress when importing (#1136)	2016-05-25 09:57:31 +02:00
main.rs	WebSockets server for signer	2016-05-27 13:03:00 +02:00
migration.rs	migration fixes (#1155)	2016-05-27 08:23:29 +02:00
price_info.rs	Fixing clippy warnings	2016-05-17 10:32:05 +02:00
rpc.rs	have parity create the PersonalClient properly	2016-05-27 16:45:26 +02:00
setup_log.rs	WebSockets server for signer	2016-05-27 13:03:00 +02:00
signer.rs	Exposing types from RPC	2016-05-27 18:50:04 +02:00
upgrade.rs	Fixing clippy warnings	2016-05-17 10:32:05 +02:00