Merge pull request #13649 from chbruyand/auth-delay-notifications

author Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>

Thu, 18 Jan 2024 18:46:39 +0000 (19:46 +0100)

committer GitHub <noreply@github.com>

Thu, 18 Jan 2024 18:46:39 +0000 (19:46 +0100)
author Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Thu, 18 Jan 2024 18:46:39 +0000 (19:46 +0100)
committer GitHub <noreply@github.com>
Thu, 18 Jan 2024 18:46:39 +0000 (19:46 +0100)
diff --cc .not-formatted
Simple merge
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/auth-main.cc
Simple merge
author	Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
	Thu, 18 Jan 2024 18:46:39 +0000 (19:46 +0100)
committer	GitHub <noreply@github.com>
	Thu, 18 Jan 2024 18:46:39 +0000 (19:46 +0100)
		1	2
.not-formatted	patch \|	diff1 \|	diff2 \|	blob \| history
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/auth-main.cc	patch \|	diff1 \|	diff2 \|	blob \| history