diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-29 13:32:48 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-29 13:32:48 +0100 |
| commit | d874fb1ac8e574a04661b15ec61ef240f88e743a (patch) | |
| tree | 9267a486240973ad7a774ecbdfc1cd5e627d567f /application | |
| parent | 9ab8d20ca8249047d2228ba183059d69b20a4e0d (diff) | |
| parent | 002b4be248e448227a718e6f7d9ee39ccc575745 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-issue-128
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 8c34fd298..2a68ce9e1 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -121,8 +121,8 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'), 'movie' => 'video/x-sgi-movie', 'doc' => 'application/msword', - 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + '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'), 'xl' => 'application/excel', 'eml' => 'message/rfc822', |