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

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
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