summaryrefslogtreecommitdiff
path: root/includes/mime.types
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2011-06-22 11:28:20 +0200
committerPierre Schmitz <pierre@archlinux.de>2011-06-22 11:28:20 +0200
commit9db190c7e736ec8d063187d4241b59feaf7dc2d1 (patch)
tree46d1a0dee7febef5c2d57a9f7b972be16a163b3d /includes/mime.types
parent78677c7bbdcc9739f6c10c75935898a20e1acd9e (diff)
update to MediaWiki 1.17.0
Diffstat (limited to 'includes/mime.types')
-rw-r--r--includes/mime.types46
1 files changed, 36 insertions, 10 deletions
diff --git a/includes/mime.types b/includes/mime.types
index bd57cd40..bf8c6dd1 100644
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -2,10 +2,10 @@ application/andrew-inset ez
application/mac-binhex40 hqx
application/mac-compactpro cpt
application/mathml+xml mathml
-application/msword doc docx docm dot dotx dotm
+application/msword doc dot
application/octet-stream bin dms lha lzh exe class so dll
application/oda oda
-application/ogg ogg ogm
+application/ogg ogx ogg ogm ogv oga spx
application/pdf pdf
application/postscript ai eps ps
application/rdf+xml rdf
@@ -13,8 +13,8 @@ application/smil smi smil
application/srgs gram
application/srgs+xml grxml
application/vnd.mif mif
-application/vnd.ms-excel xls xlsx xlsb xlam xltx xltm
-application/vnd.ms-powerpoint ppt pptm pptx pot potx potm ppsm ppam
+application/vnd.ms-excel xls xlt xla
+application/vnd.ms-powerpoint ppt pot pps ppa
application/vnd.wap.wbxml wbxml
application/vnd.wap.wmlc wmlc
application/vnd.wap.wmlscriptc wmlsc
@@ -63,10 +63,12 @@ application/x-rar rar
audio/basic au snd
audio/midi mid midi kar
audio/mpeg mpga mp2 mp3
-audio/ogg ogg
+audio/ogg oga ogg spx
+audio/webm webm
audio/x-aiff aif aiff aifc
+audio/x-matroska mka mkv
audio/x-mpegurl m3u
-audio/x-ogg ogg
+audio/x-ogg oga ogg spx
audio/x-pn-realaudio ram rm
audio/x-pn-realaudio-plugin rpm
audio/x-realaudio ra
@@ -78,13 +80,15 @@ image/cgm cgm
image/gif gif
image/ief ief
image/jpeg jpeg jpg jpe
-image/png png
+image/png png apng
image/svg+xml svg
image/tiff tiff tif
image/vnd.djvu djvu djv
image/vnd.wap.wbmp wbmp
+image/webp webp
image/x-cmu-raster ras
image/x-icon ico
+image/x-ms-bmp bmp
image/x-portable-anymap pnm
image/x-portable-bitmap pbm
image/x-portable-graymap pgm
@@ -110,12 +114,14 @@ text/vnd.wap.wmlscript wmls
text/xml xml xsl xslt rss rdf
text/x-setext etx
video/mpeg mpeg mpg mpe
-video/ogg ogm ogg
+video/ogg ogv ogm ogg
video/quicktime qt mov
video/vnd.mpegurl mxu
+video/webm webm
video/x-flv flv
+video/x-matroska mkv mka
video/x-msvideo avi
-video/x-ogg ogm ogg
+video/x-ogg ogv ogm ogg
video/x-sgi-movie movie
x-conference/x-cooltalk ice
application/vnd.oasis.opendocument.text odt
@@ -133,4 +139,24 @@ application/vnd.oasis.opendocument.image-template oti
application/vnd.oasis.opendocument.formula odf
application/vnd.oasis.opendocument.formula-template otf
application/vnd.oasis.opendocument.text-master odm
-application/vnd.oasis.opendocument.text-web oth \ No newline at end of file
+application/vnd.oasis.opendocument.text-web oth
+application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
+application/vnd.ms-word.document.macroEnabled.12 docm
+application/vnd.ms-word.template.macroEnabled.12 dotm
+application/vnd.openxmlformats-officedocument.presentationml.template potx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow ppsx
+application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
+application/vnd.ms-powerpoint.addin.macroEnabled.12 ppam
+application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm
+application/vnd.ms-powerpoint.presentation.macroEnabled.12 potm
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsm
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx
+application/vnd.ms-excel.sheet.macroEnabled.12 xlsm
+application/vnd.ms-excel.template.macroEnabled.12 xltm
+application/vnd.ms-excel.addin.macroEnabled.12 xlam
+application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsb
+model/vnd.dwfx+xps dwfx
+application/vnd.ms-xpsdocument xps
+application/x-opc+zip docx dotx docm dotm potx ppsx pptx ppam pptm potm ppsm xlsx xltx xlsm xltm xlam xlsb dwfx xps