summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-05-17 22:21:34 +0200
committerAndrey Andreev <narf@devilix.net>2015-05-17 22:21:34 +0200
commite1b20cb47c59e869b04ed04bc17d6642243c8cb8 (patch)
tree813626f58220efdbb9f616f6c8481d6525837c06 /application
parent3a9eb39f61b10b3f86e50f4cd39ca0d9f010bac2 (diff)
parentd929a80c7bf0ce5f0441a7975cffa48258820029 (diff)
Merge pull request #3861 from aanbar/update_mime_types
Update mime types
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 98a6fde97..78d8e53e3 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -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')
);