Nikolay Volf 93aa6c613a Merge branch 'master' into path-man ... Conflicts: parity/configuration.rs		2016-05-14 20:22:59 +03:00
..
directory.rs	Limiting result of the execution to execution-specific errors (#1071)	2016-05-14 13:28:44 +01:00
geth_import.rs	mod for paths & ethereum default paths	2016-05-13 13:12:32 +03:00
mod.rs	Basic Authority (#991)	2016-05-03 17:23:53 +02:00
store.rs	Configurable keys security (#1080)	2016-05-14 12:30:25 +01:00
test_account_provider.rs	Basic Authority (#991)	2016-05-03 17:23:53 +02:00