From b4945ae0c3f4e108090d05b34b3e7df8a753a2ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 07 Jul 2014 13:07:17 -0400
Subject: [PATCH] Merge branch 'master' into '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