]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' into master 7406/head
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Thu, 21 Feb 2019 12:00:44 +0000 (13:00 +0100)
committerGitHub <noreply@github.com>
Thu, 21 Feb 2019 12:00:44 +0000 (13:00 +0100)
1  2 
pdns/dnsdist.cc
pdns/dnsdist.hh

diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge