From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 06:38:11 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/sql/incremental/upd_0027.sql | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/install/sql/incremental/upd_0027.sql b/install/sql/incremental/upd_0027.sql
index 9127ede..0758065 100644
--- a/install/sql/incremental/upd_0027.sql
+++ b/install/sql/incremental/upd_0027.sql
@@ -1 +1 @@
-ALTER TABLE `dns_rr` MODIFY COLUMN `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SPF','SRV','TXT') default NULL;
+ALTER TABLE `mail_user` ADD `autoresponder_subject` VARCHAR(255) NOT NULL DEFAULT 'Out of office reply' AFTER `autoresponder_end_date`;
--
Gitblit v1.9.1