diff options
author | Darren Hill <dchill42@gmail.com> | 2011-09-01 13:43:38 +0200 |
---|---|---|
committer | Darren Hill <dchill42@gmail.com> | 2011-09-01 13:43:38 +0200 |
commit | 826675178c2c2ad697e5ac55161645abd9143bef (patch) | |
tree | df07f67a43b7467447549dfd7bd6b9e401e670ae /application/config/mimes.php | |
parent | a2ae6571e55d5a3d23645e96929eea996e9f0499 (diff) | |
parent | 886d87c616bd422585c6a1190b0e1b72bc661269 (diff) |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
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 90a1d18bb..206329fde 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -8,7 +8,7 @@ | */ -$mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), +$mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), 'cpt' => 'application/mac-compactpro', 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), 'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'), |