]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into 5900-and-other-doc-fixes 7400/head
authorPieter Lexis <pieter.lexis@powerdns.com>
Mon, 28 Jan 2019 08:50:39 +0000 (09:50 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Mon, 28 Jan 2019 08:50:39 +0000 (09:50 +0100)
1  2 
pdns/recursordist/configure.ac
pdns/recursordist/docs/changelog/4.1.rst

Simple merge