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 9b54271..f7576e4 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -10,14 +10,15 @@ image/gif   [BITMAP]
 image/png image/x-png  [BITMAP]
 image/ief      [BITMAP]
 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]
 
@@ -102,6 +103,4 @@ application/vnd.ms-excel.sheet.macroEnabled.12                                      [OFFICE]
 application/vnd.ms-excel.template.macroEnabled.12                              [OFFICE]
 application/vnd.ms-excel.addin.macroEnabled.12                                 [OFFICE]
 application/vnd.ms-excel.sheet.binary.macroEnabled.12                          [OFFICE]
-
 application/acad application/x-acad application/autocad_dwg image/x-dwg application/dwg application/x-dwg application/x-autocad image/vnd.dwg drawing/dwg [DRAWING]
-