summaryrefslogtreecommitdiff
path: root/includes/mime.info
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2014-12-27 15:41:37 +0100
committerPierre Schmitz <pierre@archlinux.de>2014-12-31 11:43:28 +0100
commitc1f9b1f7b1b77776192048005dcc66dcf3df2bfb (patch)
tree2b38796e738dd74cb42ecd9bfd151803108386bc /includes/mime.info
parentb88ab0086858470dd1f644e64cb4e4f62bb2be9b (diff)
Update to MediaWiki 1.24.1
Diffstat (limited to 'includes/mime.info')
-rw-r--r--includes/mime.info14
1 files changed, 11 insertions, 3 deletions
diff --git a/includes/mime.info b/includes/mime.info
index c7981871..07b24954 100644
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -1,5 +1,5 @@
-# Mime type info file.
-# the first mime type in each line is the "main" mime type,
+# MIME type info file.
+# the first MIME type in each line is the "main" MIME type,
# the others are aliases for this type
# the media type is given in upper case and square brackets,
# like [BITMAP], and must indicate a media type as defined by
@@ -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]
@@ -65,6 +65,9 @@ text/plain [TEXT]
text/html application/xhtml+xml [TEXT]
application/xml text/xml [TEXT]
text [TEXT]
+application/json [TEXT]
+text/csv [TEXT]
+text/tab-separated-values [TEXT]
application/zip application/x-zip [ARCHIVE]
application/x-gzip [ARCHIVE]
@@ -108,3 +111,8 @@ 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]
+chemical/x-mdl-molfile [DRAWING]
+chemical/x-mdl-sdfile [DRAWING]
+chemical/x-mdl-rxnfile [DRAWING]
+chemical/x-mdl-rdfile [DRAWING]
+chemical/x-mdl-rgfile [DRAWING]