summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2012-06-21 10:29:08 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2012-06-21 10:29:08 +0200
commit8870d3677675c73d2b4008a6a39949da617ad1c2 (patch)
tree9b7077842d960de22878a909f710f9b6e92a071f
parentcd005e6c62976eabb38112138415c1c0e19069ee (diff)
parent96d0b9834afda9d717631789210ede1dddebc86c (diff)
downloadnextcloud-server-8870d3677675c73d2b4008a6a39949da617ad1c2.tar.gz
nextcloud-server-8870d3677675c73d2b4008a6a39949da617ad1c2.zip
Merge branch 'master' of gitorious.org:owncloud/owncloud
-rw-r--r--lib/mimetypes.fixlist.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mimetypes.fixlist.php b/lib/mimetypes.fixlist.php
index a40fbd9e228..13e3f16b369 100644
--- a/lib/mimetypes.fixlist.php
+++ b/lib/mimetypes.fixlist.php
@@ -17,5 +17,6 @@ return array(
'xlsx'=>'application/msexcel',
'ppt'=>'application/mspowerpoint',
'pptx'=>'application/mspowerpoint',
- 'sgf' => 'application/sgf'
+ 'sgf' => 'application/sgf',
+ 'cdr' => 'application/coreldraw'
);