Merge pull request #13295 from omoerbeek/rec-ns-resolve-no-qm

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

Mon, 25 Sep 2023 12:34:56 +0000 (14:34 +0200)

committer GitHub <noreply@github.com>

Mon, 25 Sep 2023 12:34:56 +0000 (14:34 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Mon, 25 Sep 2023 12:34:56 +0000 (14:34 +0200)
committer GitHub <noreply@github.com>
Mon, 25 Sep 2023 12:34:56 +0000 (14:34 +0200)
diff --cc pdns/recursordist/rec-main.cc
Simple merge
diff --cc pdns/recursordist/syncres.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Mon, 25 Sep 2023 12:34:56 +0000 (14:34 +0200)
committer	GitHub <noreply@github.com>
	Mon, 25 Sep 2023 12:34:56 +0000 (14:34 +0200)
		1	2
pdns/recursordist/rec-main.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history