Merge "Force $wgCategoryCollation to be uppercase in tests"

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

diff --git a/includes/mime.types b/includes/mime.types
index 4171d28..a89d229 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -1,3 +1,4 @@
+application/acad dwg
 application/andrew-inset ez
 application/mac-binhex40 hqx
 application/mac-compactpro cpt
@@ -56,14 +57,15 @@ application/x-wais-source src
 application/x-xpinstall xpi
 application/xhtml+xml xhtml xht
 application/xslt+xml xslt
-application/xml xml xsl xsd
+application/xml xml xsl xsd kml
 application/xml-dtd dtd
-application/zip zip jar xpi  sxc stc  sxd std   sxi sti   sxm stm   sxw stw
+application/zip zip jar xpi sxc stc sxd std sxi sti sxm stm sxw stw
 application/x-rar rar
 audio/basic au snd
 audio/midi mid midi kar
 audio/mpeg mpga mp2 mp3
 audio/ogg oga ogg spx
+video/webm webm
 audio/webm webm
 audio/x-aiff aif aiff aifc
 audio/x-matroska mka mkv
@@ -79,12 +81,14 @@ image/bmp bmp
 image/cgm cgm
 image/gif gif
 image/ief ief
+image/jp2 j2k jp2 jpg2
 image/jpeg jpeg jpg jpe
 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
@@ -112,32 +116,33 @@ text/vnd.wap.wml wml
 text/vnd.wap.wmlscript wmls
 text/xml xml xsl xslt rss rdf
 text/x-setext etx
+text/x-sawfish jl
 video/mpeg mpeg mpg mpe
 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 ogv ogm ogg
 video/x-sgi-movie movie
 x-conference/x-cooltalk ice
-application/vnd.oasis.opendocument.text odt
-application/vnd.oasis.opendocument.text-template ott
+application/vnd.oasis.opendocument.chart odc
+application/vnd.oasis.opendocument.chart-template otc
+application/vnd.oasis.opendocument.database odb
+application/vnd.oasis.opendocument.formula odf
+application/vnd.oasis.opendocument.formula-template otf
 application/vnd.oasis.opendocument.graphics odg
 application/vnd.oasis.opendocument.graphics-template otg
+application/vnd.oasis.opendocument.image odi
+application/vnd.oasis.opendocument.image-template oti
 application/vnd.oasis.opendocument.presentation odp
 application/vnd.oasis.opendocument.presentation-template otp
 application/vnd.oasis.opendocument.spreadsheet ods
 application/vnd.oasis.opendocument.spreadsheet-template ots
-application/vnd.oasis.opendocument.chart odc
-application/vnd.oasis.opendocument.chart-template otc
-application/vnd.oasis.opendocument.image odi
-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 odt
 application/vnd.oasis.opendocument.text-master odm
+application/vnd.oasis.opendocument.text-template ott
 application/vnd.oasis.opendocument.text-web oth
 application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
 application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx