Commit 9549c6b2 authored by A. Täffner's avatar A. Täffner

Merge branch 'dns-status' of git.ispconfig.org:darkalex/ispconfig3 into dns-status

Conflicts:
	install/lib/installer_base.lib.php
	install/sql/incremental/upd_dev_collection.sql
parents 0ea96708 96cbb50c
......@@ -252,4 +252,3 @@ UPDATE `web_traffic` SET `traffic_date` = NULL WHERE `traffic_date` = '0000-00-0
-- DNS-Status (2 lines)
ALTER TABLE `dns_soa` ADD COLUMN `status` enum('OK','ERROR','PENDING') NOT NULL DEFAULT 'OK' AFTER `active`;
ALTER TABLE `dns_soa` ADD COLUMN `status_txt` text AFTER `status`;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment