diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-01 15:22:32 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-01 15:22:32 +0100 |
| commit | 891b7c6ea68a87127d51eb01b401a948f6ae3753 (patch) | |
| tree | a375df9e412cc8ea8f29417471dbf32d81e2f9b8 /application | |
| parent | d6abf118dcf018bf9d3535410daadf1135ad6c05 (diff) | |
| parent | 67f71a415c4bd7a206fcfc1a6007d74af4590883 (diff) | |
Merge upstream branch
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 2a68ce9e1..d69497a30 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -120,7 +120,7 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'mov' => 'video/quicktime', 'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'), 'movie' => 'video/x-sgi-movie', - 'doc' => 'application/msword', + 'doc' => array('application/msword', 'application/vnd.ms-office'), 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'), 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'), 'word' => array('application/msword', 'application/octet-stream'), |