# HG changeset patch
# User Piotr Sikora <piotr@cloudflare.com>
# Date 1379534387 25200
# Node ID 1adfe7a260ebe6fa3519b5229847c53470321990
# Parent  e8d24b6d7f7304df77ccde7fc8223434c91b5322
MIME: added application/json MIME type.

Signed-off-by: Piotr Sikora <piotr@cloudflare.com>

diff --git a/conf/mime.types b/conf/mime.types
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -26,6 +26,7 @@ types {
 
     application/font-woff                 woff;
     application/java-archive              jar war ear;
+    application/json                      json;
     application/mac-binhex40              hqx;
     application/msword                    doc;
     application/pdf                       pdf;