Merge branch 'master' into csp-fix

2017-07-11 13:45:23 +02:00
parent b0f1f8307d 4936e99f30
commit ba4d8ceaf3
118 changed files with 3716 additions and 667 deletions
--- a/dapps/src/handlers/content.rs
+++ b/dapps/src/handlers/content.rs
@@ -40,10 +40,6 @@ impl ContentHandler {
 		Self::new(StatusCode::Ok, content, mimetype)
 	}

-	pub fn not_found(content: String, mimetype: Mime) -> Self {
-		Self::new(StatusCode::NotFound, content, mimetype)
-	}
-
 	pub fn html(code: StatusCode, content: String, embeddable_on: Embeddable) -> Self {
 		Self::new_embeddable(code, content, mime!(Text/Html), embeddable_on)
 	}