summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-05-01 12:21:07 +0200
committerAndrey Andreev <narf@devilix.net>2015-05-01 12:21:07 +0200
commit8afed052243ac0ee19fbe915cbeba0989c9eb1ef (patch)
tree86565bd00e82cfd58bc13dd2c0628119c4b5c9c6
parent73b9e851a96dcafc0c07a0d0480853e31ba48e59 (diff)
parent66553a0d117e4e2a2692a3a89a605ab2424f199f (diff)
Merge pull request #3825 from intekhabrizvi/develop
MIMES : added new mime type for 3gp based video file upload
-rw-r--r--application/config/mimes.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 8eff4d2d5..98a6fde97 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -127,7 +127,7 @@ return array(
'rsa' => 'application/x-pkcs7',
'cer' => array('application/pkix-cert', 'application/x-x509-ca-cert'),
'3g2' => 'video/3gpp2',
- '3gp' => 'video/3gp',
+ '3gp' => array('video/3gp', 'video/3gpp'),
'mp4' => 'video/mp4',
'm4a' => 'audio/x-m4a',
'f4v' => 'video/mp4',