summaryrefslogtreecommitdiffstats
path: root/application/config/mimes.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 13:41:35 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 13:41:35 +0100
commitaa8a36acdbb31b0850747ddf0d2aaff0ab7e657f (patch)
treeea77ab316e9127063b9b73a87a9d745464c22965 /application/config/mimes.php
parentbc93687708e01739e07d37042a09847d18d00a0c (diff)
parent002b4be248e448227a718e6f7d9ee39ccc575745 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-sqlsrv
Diffstat (limited to 'application/config/mimes.php')
-rw-r--r--application/config/mimes.php4
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',