Merge

2015-01-16 05:21:33 -08:00 · 2015-01-16 05:21:33 -08:00 · 15ff62dbab
commit 15ff62dbab
parent 26a050a3e5 ddb14d0f70
2951 changed files with 72429 additions and 7413 deletions
--- a/WebsitePanel/Database/install_db.sql
+++ b/WebsitePanel/Database/install_db.sql
@ -21064,6 +21064,7 @@ SET @sql = @sql + ' SELECT COUNT(DomainID) FROM @Domains;SELECT
 	WS.ItemName AS WebSiteName,
 	ISNULL(MD.ItemID, 0) AS MailDomainID,
 	MD.ItemName AS MailDomainName,
+	Z.ItemName AS ZoneName,
 	D.IsSubDomain,
 	D.IsInstantAlias,
 	D.IsDomainPointer,
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql