Merge pull request #13276 from omoerbeek/rec-conf-dir

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

Wed, 20 Sep 2023 11:22:18 +0000 (13:22 +0200)

committer GitHub <noreply@github.com>

Wed, 20 Sep 2023 11:22:18 +0000 (13:22 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 20 Sep 2023 11:22:18 +0000 (13:22 +0200)
committer GitHub <noreply@github.com>
Wed, 20 Sep 2023 11:22:18 +0000 (13:22 +0200)
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
diff --cc pdns/recursordist/docs/yamlsettings.rst
Simple merge
diff --cc pdns/recursordist/settings/table.py
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Wed, 20 Sep 2023 11:22:18 +0000 (13:22 +0200)
committer	GitHub <noreply@github.com>
	Wed, 20 Sep 2023 11:22:18 +0000 (13:22 +0200)
		1	2
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/yamlsettings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/settings/table.py	patch \|	diff1 \|	diff2 \|	blob \| history