From 8edabf647814a012307bbf68628e4656ecf89eff Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 14:12:28 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 install/sql/incremental/upd_0035.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_0035.sql b/install/sql/incremental/upd_0035.sql
index b2f8516..5f8031c 100644
--- a/install/sql/incremental/upd_0035.sql
+++ b/install/sql/incremental/upd_0035.sql
@@ -20,6 +20,6 @@
 -- --------------------------------------------------------
 
 ALTER TABLE  `web_domain` ADD  `ssl_key` MEDIUMTEXT NOT NULL AFTER  `ssl_bundle`;
-ALTER TABLE  `mail_user` ADD  `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER  `disablelda`
+ALTER TABLE  `mail_user` ADD  `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER  `disablelda`;
 
 

--
Gitblit v1.9.1