Merged ImageFunctions.php into GlobalFunctions.php

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

diff --git a/includes/mime.types b/includes/mime.types
index 0e0b067..5b64201 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -57,9 +57,9 @@ 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
@@ -127,21 +127,22 @@ 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