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

Merge branch 'master' into dns-status 

Conflicts:
	install/sql/incremental/upd_dev_collection.sql
	server/plugins-available/bind_plugin.inc.php
parents de078e69 f611abe1
Hide whitespace changes
Inline Side-by-side
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