From dee987b263b021b990ea4c62cb15be47c6d61fb5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 Jan 2015 08:30:12 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

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

diff --git a/install/sql/incremental/upd_0073.sql b/install/sql/incremental/upd_0073.sql
index 3dcbc36..3ed9a5d 100644
--- a/install/sql/incremental/upd_0073.sql
+++ b/install/sql/incremental/upd_0073.sql
@@ -1,3 +1,4 @@
 ALTER TABLE `client_template` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
 ALTER TABLE `client` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
 ALTER TABLE  `web_domain` CHANGE  `php_fpm_use_socket`  `php_fpm_use_socket` ENUM(  'n',  'y' ) NOT NULL DEFAULT  'y';
+ALTER TABLE `mail_domain` ADD `dkim_selector` VARCHAR(63) NOT NULL DEFAULT 'default' AFTER `dkim`;

--
Gitblit v1.9.1