]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fccade0 afe362f)
Merge branch 'master' into rec-prep-rec-4.3.0-rc1
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Mon, 3 Feb 2020 08:36:31 +0000 (09:36 +0100)
committerGitHub <noreply@github.com>
Mon, 3 Feb 2020 08:36:31 +0000 (09:36 +0100)
1  2 
docs/secpoll.zone patch | diff1 | diff2 | blob | history

diff --cc docs/secpoll.zone
Simple merge
Unnamed repository; edit this file 'description' to name the repository.