diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 14:55:42 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 14:55:42 +0100 |
| commit | 790eb70064e4bfac67399e7e0e9d3dc329839428 (patch) | |
| tree | 465d7e83fb943fe886628287b92ef6c12e6886fa /application/config/mimes.php | |
| parent | 76988e6827ed9e5eef43e8132df0f3705624c886 (diff) | |
| parent | 3722e50439fd88281f8730fd329b41812cd19963 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config/mimes.php')
| -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'), |