Merge "Reorganise the functions doing wfProfileOut and returning on all if branches."

[lhc/web/wiklou.git] / includes / mime.info

diff --git a/includes/mime.info b/includes/mime.info
index d705715..f7576e4 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -13,12 +13,12 @@ image/jpeg  [BITMAP]
 image/jp2      [BITMAP]
 image/xbm      [BITMAP]
 image/tiff     [BITMAP]
-image/x-icon   [BITMAP]
+image/x-icon image/x-ico       [BITMAP]
 image/x-rgb    [BITMAP]
 image/x-portable-pixmap                [BITMAP]
 image/x-portable-graymap image/x-portable-greymap      [BITMAP]
 image/x-bmp image/x-ms-bmp image/bmp application/x-bmp application/bmp [BITMAP]
-image/x-photoshop image/psd image/x-psd image/photoshop        [BITMAP]
+image/x-photoshop image/psd image/x-psd image/photoshop image/vnd.adobe.photoshop      [BITMAP]
 image/vnd.djvu image/x.djvu image/x-djvu [BITMAP]
 image/webp     [BITMAP]