]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into webserver-logging
authorPieter Lexis <pieter.lexis@powerdns.com>
Mon, 21 Jan 2019 16:27:30 +0000 (17:27 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Mon, 21 Jan 2019 16:27:30 +0000 (17:27 +0100)
1  2 
build-scripts/jsoref-spellchecker/whitelist.words
pdns/pdns_recursor.cc
pdns/ws-auth.cc

Simple merge
diff --cc pdns/ws-auth.cc
Simple merge