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

---
 program/.htaccess |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/.htaccess b/program/.htaccess
index 8114af6..be9e7e2 100644
--- a/program/.htaccess
+++ b/program/.htaccess
@@ -1,4 +1,4 @@
 <IfModule mod_rewrite.c>
 RewriteEngine On
-RewriteRule !^js|.*\.[gt]if$ - [F]
+RewriteRule !^(js|resources) - [F]
 </IfModule>

--
Gitblit v1.9.1