From 741aa6aa3ec188aa4f37b26dc3314e2d0cd811aa Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 07 May 2015 11:43:50 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

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

diff --git a/install/sql/incremental/upd_0078.sql b/install/sql/incremental/upd_0078.sql
index e9948dc..ea78b87 100644
--- a/install/sql/incremental/upd_0078.sql
+++ b/install/sql/incremental/upd_0078.sql
@@ -1 +1,2 @@
 ALTER TABLE `dns_rr` CHANGE `data` `data` TEXT NOT NULL DEFAULT '';
+ALTER TABLE  `web_domain` DROP INDEX `serverdomain`, ADD UNIQUE  `serverdomain` (  `server_id` , `ip_address`, `domain` );

--
Gitblit v1.9.1