summaryrefslogtreecommitdiffstats
path: root/application/config/mimes.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-28 14:01:47 +0200
committerAndrey Andreev <narf@bofh.bg>2012-03-28 14:01:47 +0200
commit9602651a0d435b8ccef1965a154e8a33594de6f3 (patch)
treeeef01a98150dc7703a98266fe92b0a802078b083 /application/config/mimes.php
parent0cfc3fdaf1f0b928dd3cf3fc916275d30f34a550 (diff)
parent8e2478e7310b5cfff88b64ff5d84b71f1c124b58 (diff)
Merge upstream branch
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