From dad105ff4110e29a584af3e5dc75c0f3cfcd0dce Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 29 Feb 2016 14:25:26 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/sites/database_edit.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index e64a03f..213063a 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -262,7 +262,6 @@
 					}
 					unset($tmp);
 				}
-
 			}
 		} else {
 			// check if client of database parent domain is client of db user!

--
Gitblit v1.9.1