From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 config/mimetypes.php |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/config/mimetypes.php b/config/mimetypes.php
index f0c1013..7665df3 100644
--- a/config/mimetypes.php
+++ b/config/mimetypes.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Local mapping file to specify mime-types based on common file-name extensions
+ *
+ * Please note that this mapping takes precedence over the content-based mime-type detection
+ * and should only contain mappings which cannot be detected properly from the file contents.
+ */
+
 return array(
   'xls' => 'application/vnd.ms-excel',
   'xlm' => 'application/vnd.ms-excel',

--
Gitblit v1.9.1