From 62f5b704bcf35b25f5fabbadd8faa9d70b0b3fbf Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 22 Mar 2016 09:29:01 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 install/sql/pre_update.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/pre_update.sql b/install/sql/pre_update.sql
index 31e890d..cf51510 100644
--- a/install/sql/pre_update.sql
+++ b/install/sql/pre_update.sql
@@ -38,7 +38,7 @@
 DROP TABLE IF EXISTS `billing_service_class`;
 DROP TABLE IF EXISTS `billing_tax`;
 DROP TABLE IF EXISTS `client_address_book`;
-DROP TABLE IF EXISTS `domain`;
+-- DROP TABLE IF EXISTS `domain`;
 DROP TABLE IF EXISTS `domain_handle`;
 DROP TABLE IF EXISTS `domain_provider`;
 DROP TABLE IF EXISTS `domain_tld`;

--
Gitblit v1.9.1