• A. Täffner's avatar
    Merge branch 'dns-status' of git.ispconfig.org:darkalex/ispconfig3 into... · bfb47244
    A. Täffner authored
    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
    bfb47244
bind_plugin.inc.php 23.3 KB