Merge pull request #10420 from omoerbeek/rec-nod-no-qm

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

Wed, 19 May 2021 08:34:49 +0000 (10:34 +0200)

committer GitHub <noreply@github.com>

Wed, 19 May 2021 08:34:49 +0000 (10:34 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 19 May 2021 08:34:49 +0000 (10:34 +0200)
committer GitHub <noreply@github.com>
Wed, 19 May 2021 08:34:49 +0000 (10:34 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Wed, 19 May 2021 08:34:49 +0000 (10:34 +0200)
committer	GitHub <noreply@github.com>
	Wed, 19 May 2021 08:34:49 +0000 (10:34 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history