diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-08-30 09:58:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 09:58:19 +0200 |
| commit | 059b7a4e0b3da684a33d3caa54f78ed5003f4a2a (patch) | |
| tree | dd22fc68d97eee523411b30f785420108dcb175a /application/config | |
| parent | 0c584a1576e5e935309f0ace21048907576defa1 (diff) | |
| parent | 19d033c5e32b0ab61041381c76b34f972513e525 (diff) | |
Merge pull request #4788 from edtsz/patch-2
Add OpenOffice mime-types to config/mimes.php
Diffstat (limited to 'application/config')
| -rw-r--r-- | application/config/mimes.php | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 8bac87251..017653335 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -163,5 +163,21 @@ return array( 'vcf' => 'text/x-vcard', 'srt' => array('text/srt', 'text/plain'), 'vtt' => array('text/vtt', 'text/plain'), - 'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon') + 'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon'), + 'odc' => 'application/vnd.oasis.opendocument.chart', + 'otc' => 'application/vnd.oasis.opendocument.chart-template', + 'odf' => 'application/vnd.oasis.opendocument.formula', + 'otf' => 'application/vnd.oasis.opendocument.formula-template', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'otg' => 'application/vnd.oasis.opendocument.graphics-template', + 'odi' => 'application/vnd.oasis.opendocument.image', + 'oti' => 'application/vnd.oasis.opendocument.image-template', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'otp' => 'application/vnd.oasis.opendocument.presentation-template', + 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', + 'odt' => 'application/vnd.oasis.opendocument.text', + 'odm' => 'application/vnd.oasis.opendocument.text-master', + 'ott' => 'application/vnd.oasis.opendocument.text-template', + 'oth' => 'application/vnd.oasis.opendocument.text-web' ); |