summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-06-23 09:12:14 +0200
committerAndrey Andreev <narf@devilix.net>2015-06-23 09:12:14 +0200
commit55fdd0a10f9120030f5bb6e6c3a760386abcd8f1 (patch)
tree3af9eaf370d326d1766c7490ac01f9898748e14c /application
parent3022d17866281b76ac754aad28dbe61a8a12887d (diff)
parentfb108204d198c9dc1d964cabe5c29ae106a25216 (diff)
Merge pull request #3924 from EdersonTS/patch-1
[ci skip] Add .ico mime type
Diffstat (limited to 'application')
-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 78d8e53e3..f9b74bfb2 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -154,5 +154,6 @@ return array(
'svg' => array('image/svg+xml', 'application/xml', 'text/xml'),
'vcf' => 'text/x-vcard',
'srt' => array('text/srt', 'text/plain'),
- 'vtt' => array('text/vtt', 'text/plain')
+ 'vtt' => array('text/vtt', 'text/plain'),
+ 'ico' => 'image/x-icon'
);