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

Merge branch 'dns_import' into 'stable-3.1' 

DNS: dns import fixes, NAPTR support, TLSA and CAA in remote api.

See merge request ispconfig/ispconfig3!985
parents 90e6967b 8eca37ff
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