Merge "Make image/vnd.microsoft.icon be an alias for image/x-icon mime type."

diff --git a/includes/mime.info b/includes/mime.info
index b86d7d7..07b2495 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -13,7 +13,7 @@ image/jpeg    [BITMAP]
 image/jp2      [BITMAP]
 image/xbm      [BITMAP]
 image/tiff     [BITMAP]
-image/x-icon image/x-ico       [BITMAP]
+image/x-icon image/x-ico image/vnd.microsoft.icon      [BITMAP]
 image/x-rgb    [BITMAP]
 image/x-portable-pixmap                [BITMAP]
 image/x-portable-graymap image/x-portable-greymap      [BITMAP]

diff --git a/includes/mime.types b/includes/mime.types
index ae6ca4d..75017db 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -91,6 +91,7 @@ image/png png apng
 image/svg+xml svg
 image/tiff tiff tif
 image/vnd.djvu djvu djv
+image/vnd.microsoft.icon ico
 image/vnd.wap.wbmp wbmp
 image/webp webp
 image/x-cmu-raster ras