]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into api-tsig-keys
authorPieter Lexis <pieter.lexis@powerdns.com>
Tue, 21 Aug 2018 11:11:46 +0000 (13:11 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Tue, 21 Aug 2018 11:11:46 +0000 (13:11 +0200)
1  2 
pdns/ws-auth.cc
regression-tests.api/test_Zones.py

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