diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-02-29 12:59:35 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-02-29 12:59:35 +0100 |
| commit | 6b414d12c3ddeb09f62b0a1e111599390fa3f613 (patch) | |
| tree | f1a1b4b2f200c93316064f4692b93f7f5ed45962 /application/config | |
| parent | 0aa8c60ae7eee0122c42ae17d42fd5471a575743 (diff) | |
| parent | db6066511bfc1a728049fdadaad14f1d10cd9796 (diff) | |
Merged in 2.1-stable changes.
Diffstat (limited to 'application/config')
| -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', |