diff options
| author | Tim Nolte <noltet@sekisui-spi.com> | 2015-06-08 18:25:34 +0200 |
|---|---|---|
| committer | Tim Nolte <noltet@sekisui-spi.com> | 2015-06-08 18:25:34 +0200 |
| commit | 89ed9fafd75e3b65a7691f1b13440bdedadf5eda (patch) | |
| tree | 5dfa69c55ff48502527fcb6f4f532fb5ad6651ca /application/config/mimes.php | |
| parent | 2ac4177b4b6afc63d594523416c3991d23dddf20 (diff) | |
| parent | b76394834a3e36e8c376913cd9666a8d7a4cea45 (diff) | |
Merge branch 'develop' into feature/mysqli-ssl
Diffstat (limited to 'application/config/mimes.php')
| -rw-r--r-- | application/config/mimes.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 8eff4d2d5..78d8e53e3 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', @@ -152,5 +152,7 @@ return array( 'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'), 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'), 'svg' => array('image/svg+xml', 'application/xml', 'text/xml'), - 'vcf' => 'text/x-vcard' + 'vcf' => 'text/x-vcard', + 'srt' => array('text/srt', 'text/plain'), + 'vtt' => array('text/vtt', 'text/plain') ); |