(bug 17497) Oasis opendocument added to mime.types (odg otg odt ott odp otp ods ots)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index adea68f..fe0dfdd 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -102,6 +102,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   'ellipsis' message
 * Wrap warning message 'editinginterface' into a div with class
   'mw-editinginterface'
+* (bug 17497) Oasis opendocument added to mime.types
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.

diff --git a/includes/mime.types b/includes/mime.types
index 2b8cb9a..26e051e 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -58,7 +58,7 @@ application/xhtml+xml xhtml xht
 application/xslt+xml xslt
 application/xml xml xsl xsd
 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  odg otg  odt ott  odp otp  ods ots
 application/x-rar rar
 audio/basic au snd
 audio/midi mid midi kar