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

---
 .htaccess |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 25e153f..345d26d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -30,8 +30,9 @@
 RewriteEngine On
 RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
 # security rules
-RewriteRule .git - [F]
-RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|SQL|bin|CHANGELOG)$ - [F]
+RewriteRule \.git - [F]
+RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ - [F]
+RewriteRule ^/?(SQL|bin) - [F]
 </IfModule>
 
 <IfModule mod_deflate.c>

--
Gitblit v1.9.1