Merge branch 'master' of github.com:ethcore/parity into move_hash

This commit is contained in:
debris 2016-08-05 14:05:51 +02:00
commit e79623704e

View File

@ -50,7 +50,7 @@ impl Deprecated {
} }
fn dapps_off() -> Self { fn dapps_off() -> Self {
Deprecated::Replaced("--dapps-off", "--no-daps") Deprecated::Replaced("--dapps-off", "--no-dapps")
} }
fn ipcdisable() -> Self { fn ipcdisable() -> Self {