diff options
author | Pascal Kriete <pascal.kriete@ellislab.com> | 2011-01-07 21:05:47 +0100 |
---|---|---|
committer | Pascal Kriete <pascal.kriete@ellislab.com> | 2011-01-07 21:05:47 +0100 |
commit | 3ef0d283693178ceec9e9e4fb6b0d22538c3af34 (patch) | |
tree | 9d9b78bed047f7cbfc4873d2dcba50173cd3be0b /application/config/mimes.php | |
parent | 43ded2351b2703bf6fc6d9d0b2311cb08194d4bf (diff) | |
parent | 0711dc87d98ce20d3a87f7ac43d78af8fba1dca7 (diff) |
Automated merge with http://hg.ellislab.com/CodeIgniter2
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 f31fff2ec..146d3f9e0 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -56,7 +56,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'midi' => 'audio/midi', 'mpga' => 'audio/mpeg', 'mp2' => 'audio/mpeg', - 'mp3' => array('audio/mpeg', 'audio/mpg'), + 'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3'), 'aif' => 'audio/x-aiff', 'aiff' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', |