Merge "Small code cleanups to MWCallableUpdate"

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

diff --git a/includes/mime.info b/includes/mime.info
index 243e280..999be92 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -9,7 +9,7 @@
 image/gif      [BITMAP]
 image/png image/x-png  [BITMAP]
 image/ief      [BITMAP]
-image/jpeg     [BITMAP]
+image/jpeg image/pjpeg [BITMAP]
 image/jp2      [BITMAP]
 image/xbm      [BITMAP]
 image/tiff     [BITMAP]
@@ -76,7 +76,7 @@ application/x-bzip2   [ARCHIVE]
 application/x-tar      [ARCHIVE]
 application/x-stuffit  [ARCHIVE]
 application/x-opc+zip  [ARCHIVE]
-
+application/x-7z-compressed [ARCHIVE]
 
 text/javascript application/x-javascript application/x-ecmascript text/ecmascript      [EXECUTABLE]
 application/x-bash     [EXECUTABLE]