Merge pull request #13819 from omoerbeek/rec-ta

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

Tue, 7 May 2024 09:32:46 +0000 (11:32 +0200)

committer GitHub <noreply@github.com>

Tue, 7 May 2024 09:32:46 +0000 (11:32 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 7 May 2024 09:32:46 +0000 (11:32 +0200)
committer GitHub <noreply@github.com>
Tue, 7 May 2024 09:32:46 +0000 (11:32 +0200)
diff --cc .not-formatted
Simple merge
diff --cc pdns/recursordist/settings/docs-new-preamble-in.rst
Simple merge
diff --cc pdns/recursordist/settings/table.py
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 7 May 2024 09:32:46 +0000 (11:32 +0200)
committer	GitHub <noreply@github.com>
	Tue, 7 May 2024 09:32:46 +0000 (11:32 +0200)
		1	2
.not-formatted	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/settings/docs-new-preamble-in.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/settings/table.py	patch \|	diff1 \|	diff2 \|	blob \| history