summaryrefslogtreecommitdiffstats
path: root/application/config/mimes.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-26 20:51:00 +0200
committerAndrey Andreev <narf@bofh.bg>2012-03-26 20:51:00 +0200
commit925d37391789405f53da73979305dead6a053099 (patch)
tree0ed90207fe66bb5491e8925d20d48c211a897cf8 /application/config/mimes.php
parente6f7d610b189e243ad48dcc3900a5c53cab2498d (diff)
parent84c3b27fface58ecfcd0acf7172d3ee2043b3673 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-helpers-acc
Diffstat (limited to 'application/config/mimes.php')
-rw-r--r--application/config/mimes.php5
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