From 0d5e54e5a149a24f8cc04989be2e7611d98852a4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sat, 10 Jan 2015 09:49:21 -0500
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