summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-01-26 20:35:28 +0100
committerAndrey Andreev <narf@bofh.bg>2013-01-26 20:35:28 +0100
commitd14569cb2451fe3604d8623dc7de38efda57e790 (patch)
tree3540ce337044b5210bcf7770a998d71744aee156 /application/config
parent1307637e8649d7a20652f77cc397d0631d5d9a1e (diff)
parentcabead10ac1e9d2aee0cc8bd5270061e75aec179 (diff)
Merge pull request #2195 from rebornishard/patch-1
Add webm mime type
Diffstat (limited to 'application/config')
-rw-r--r--application/config/mimes.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 124e4a436..d9e81bf77 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -154,6 +154,7 @@ return array(
'mp4' => 'video/mp4',
'm4a' => 'audio/x-m4a',
'f4v' => 'video/mp4',
+ 'webm' => 'video/webm'
'aac' => 'audio/x-acc',
'm4u' => 'application/vnd.mpegurl',
'm3u' => 'text/plain',
@@ -175,4 +176,4 @@ return array(
);
/* End of file mimes.php */
-/* Location: ./application/config/mimes.php */ \ No newline at end of file
+/* Location: ./application/config/mimes.php */