# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1323875765 0
# Node ID a1bb976ec16a8f0a917af445b7766f1623c0127d
# Parent  94b995c7c6149c749c0450e63c6891c19c64ea51
Merge of r4282, r4302:

Added image/webp and video/webm MIME types.  Added svgz extension for
compressed SVG.

diff --git a/conf/mime.types b/conf/mime.types
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -21,7 +21,8 @@ types {
     image/x-icon                          ico;
     image/x-jng                           jng;
     image/x-ms-bmp                        bmp;
-    image/svg+xml                         svg;
+    image/svg+xml                         svg svgz;
+    image/webp                            webp;
 
     application/java-archive              jar war ear;
     application/mac-binhex40              hqx;
@@ -69,6 +70,7 @@ types {
     video/mp4                             mp4;
     video/mpeg                            mpeg mpg;
     video/quicktime                       mov;
+    video/webm                            webm;
     video/x-flv                           flv;
     video/x-m4v                           m4v;
     video/x-mng                           mng;