Skip to content
Commit bfb47244 authored by A. Täffner's avatar A. Täffner
Browse files

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

Merge branch 'dns-status' of git.ispconfig.org:darkalex/ispconfig3 into dns-status and fixed some small issues

Conflicts:
	install/lib/installer_base.lib.php
	install/sql/incremental/upd_dev_collection.sql
	interface/web/dns/list/dns_soa.list.php
	interface/web/dns/templates/dns_soa_admin_list.htm
	interface/web/dns/templates/dns_soa_list.htm
	server/plugins-available/bind_plugin.inc.php
parents 4fb99c9c 9549c6b2
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