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/js/tiny_mce/plugins/table/css/table.css |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/js/tiny_mce/plugins/table/css/table.css b/program/js/tiny_mce/plugins/table/css/table.css
index 804f766..d11c3f6 100644
--- a/program/js/tiny_mce/plugins/table/css/table.css
+++ b/program/js/tiny_mce/plugins/table/css/table.css
@@ -1,7 +1,7 @@
 /* CSS file for table dialog in the table plugin */
 
 .panel_wrapper div.current {
-	height: 220px;
+	height: 245px;
 }
 
 .advfield {

--
Gitblit v1.9.1