Merge branch 'master' into secretstore_kovan

2017-11-23 07:27:13 +03:00
parent b036624bac d793019607
commit 12e9c1cebc
666 changed files with 1080 additions and 47327 deletions
--- a/parity/dapps.rs
+++ b/parity/dapps.rs
@@ -194,9 +194,7 @@ mod server {

 	pub struct Middleware;
 	impl RequestMiddleware for Middleware {
-		fn on_request(
-			&self, _req: &hyper::server::Request<hyper::net::HttpStream>, _control: &hyper::Control
-		) -> RequestMiddlewareAction {
+		fn on_request(&self, _req: hyper::Request) -> RequestMiddlewareAction {
 			unreachable!()
 		}
 	}
@@ -297,6 +295,7 @@ mod server {
 					version: app.version,
 					author: app.author,
 					icon_url: app.icon_url,
+					local_url: app.local_url,
 				})
 				.collect()
 		}