Skip to content
Commit af4b6986 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'master' into 'stable-3.1' 

Hide DNSSEC from SOA if DNS-Mirrors are available (prevents broken DNSSEC-Implem…

…entaion on Multiserver-Setups)

See merge request !400
parents 1dc92d03 d17ae005
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