]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80c320d d0283b3)
Merge branch 'master' into set-publish-cds-2-rebase 7976/head
authorMatt Nordhoff <mnordhoff@mattnordhoff.com>
Mon, 24 Jun 2019 18:45:28 +0000 (18:45 +0000)
committerMatt Nordhoff <mnordhoff@mattnordhoff.com>
Mon, 24 Jun 2019 18:45:28 +0000 (18:45 +0000)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.