summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-09-11 15:44:36 +0200
committerAndrey Andreev <narf@devilix.net>2014-09-11 15:44:36 +0200
commit4f86b35b0c334435af96c4be2bf5b6ce4eb49dea (patch)
tree97c3365d134a4133fa8a77a3d85cbe749ee4e539 /application
parent03eeb366a6e71d184f448353e5b2ce2a9a42b812 (diff)
parent4b73882124dfe5e9aec9686fef168be1fc590dfe (diff)
Merge pull request #3229 from aanbar/add_vcard_to_mime
Added vcard 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 a014cb459..bab431f77 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -175,7 +175,8 @@ return array(
'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'),
'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')
+ 'svg' => array('image/svg+xml', 'application/xml', 'text/xml'),
+ 'vcf' => 'text/x-vcard'
);
/* End of file mimes.php */