From c503ee45ed3a50dc45073df985d80d2bb9653c6e Mon Sep 17 00:00:00 2001
From: cmcnulty <cmcnulty@kznf.com>
Date: Sat, 9 Nov 2013 20:55:56 -0600
Subject: remerge with master

---
 skins/larry/templates/mail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'skins/larry/templates/mail.html')

diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index f60fe2a3f..f2c52c820 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -175,7 +175,7 @@
 </div>
 
 <div id="listoptions" class="propform popupdialog">
-	<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
+<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
 	<fieldset class="floating">
 		<legend><roundcube:label name="listcolumns" /></legend>
 		<ul class="proplist">
-- 
cgit v1.2.3