summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-07 15:55:27 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-07 15:55:27 +0200
commit486b17c1f39e04c952de995d68412db4d6477c3c (patch)
tree57a44b04a9cbe570de8f905bb0b2d70c30895cb5 /application/config
parentec19332ba3791c933f2221d972ee073684b5ea3b (diff)
parent0252fc7ddf80262f915b20100107ec79ba3ccf01 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config')
-rw-r--r--application/config/mimes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 206329fde..6f73ae038 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -66,7 +66,7 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe
'rpm' => 'audio/x-pn-realaudio-plugin',
'ra' => 'audio/x-realaudio',
'rv' => 'video/vnd.rn-realvideo',
- 'wav' => 'audio/x-wav',
+ 'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'),
'bmp' => array('image/bmp', 'image/x-windows-bmp'),
'gif' => 'image/gif',
'jpeg' => array('image/jpeg', 'image/pjpeg'),
@@ -137,4 +137,4 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe
/* End of file mimes.php */
-/* Location: ./application/config/mimes.php */ \ No newline at end of file
+/* Location: ./application/config/mimes.php */