From 4ae3b94bce6b2f26002c1a50247a01ab4cf2219a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:27:43 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

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

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index e60ae02..e69de29 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1,10 +0,0 @@
-ALTER TABLE `mail_user`
-	CHANGE `uid` `uid` int(11) NOT NULL DEFAULT '5000',
-	CHANGE `gid` `gid` int(11) NOT NULL DEFAULT '5000';
-
-ALTER TABLE `client_template` ADD `default_mailserver` INT(11) NOT NULL DEFAULT 1;
-ALTER TABLE `client_template` ADD `default_webserver` INT(11) NOT NULL DEFAULT 1;
-ALTER TABLE `client_template` ADD `default_dnsserver` INT(11) NOT NULL DEFAULT 1;
-ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT(11) NOT NULL DEFAULT 1;
-ALTER TABLE `client_template` ADD `default_dbserver` INT(11) NOT NULL DEFAULT 1;
-ALTER TABLE  `client` ADD  `contact_firstname` VARCHAR( 64 ) NOT NULL DEFAULT '' AFTER  `gender`;

--
Gitblit v1.9.1