Merge branch 'content-server' into idmanager

Conflicts:
	webapp/src/lib.rs
This commit is contained in:
Tomasz Drwięga 2016-05-16 13:15:18 +02:00
commit 2d18bc936f
1 changed files with 1 additions and 1 deletions

View File

@ -24,7 +24,7 @@ extern crate parity_idmanager;
#[cfg(feature = "parity-wallet")]
extern crate parity_wallet;
pub const DAPPS_DOMAIN : &'static str = ".dapp";
pub const DAPPS_DOMAIN : &'static str = ".parity";
pub const RPC_PATH : &'static str = "rpc";
pub const API_PATH : &'static str = "api";
pub const UTILS_PATH : &'static str = "parity-utils";