diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-03-28 13:44:35 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-03-28 13:44:35 +0200 |
commit | 26c708514e3ca04a1c373efd166b5c17c31e3796 (patch) | |
tree | 8c2241630f236733da08770bcbcf9d17461a0f78 /application/config/mimes.php | |
parent | ed1aa21dcd5312b2884f140be8c0d2ee94379423 (diff) | |
parent | 8f50b6b36cb743be8b70809279e501c20b8e38e2 (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driver
Diffstat (limited to 'application/config/mimes.php')
-rw-r--r-- | application/config/mimes.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 7ec782b60..02e12c011 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -34,7 +34,8 @@ | */ -$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'), @@ -165,4 +166,4 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe ); /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ +/* Location: ./application/config/mimes.php */
\ No newline at end of file |