Merge pull request #10865 from Habbie/api-v1

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Mon, 8 Nov 2021 09:02:19 +0000 (10:02 +0100)

committer GitHub <noreply@github.com>

Mon, 8 Nov 2021 09:02:19 +0000 (10:02 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Mon, 8 Nov 2021 09:02:19 +0000 (10:02 +0100)
committer GitHub <noreply@github.com>
Mon, 8 Nov 2021 09:02:19 +0000 (10:02 +0100)
diff --cc pdns/ws-auth.cc
Simple merge
diff --cc pdns/ws-recursor.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Mon, 8 Nov 2021 09:02:19 +0000 (10:02 +0100)
committer	GitHub <noreply@github.com>
	Mon, 8 Nov 2021 09:02:19 +0000 (10:02 +0100)
		1	2
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history