Merge "Move brace matching rules to Preprocessor class"

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

diff --git a/includes/mime.types b/includes/mime.types
index ae6ca4d..3b9899f 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -20,8 +20,10 @@ application/vnd.wap.wbxml wbxml
 application/vnd.wap.wmlc wmlc
 application/vnd.wap.wmlscriptc wmlsc
 application/voicexml+xml vxml
+application/x-7z-compressed 7z
 application/x-bcpio bcpio
-application/x-bzip gz bz2
+application/x-bzip bz
+application/x-bzip2 bz2
 application/x-cdlink vcd
 application/x-chess-pgn pgn
 application/x-cpio cpio
@@ -91,6 +93,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