Merge commit 'refs/pull/1853/head' of github.com:znc/znc

author Alexey Sokolov <redacted>

Sat, 7 Jan 2023 20:41:48 +0000 (20:41 +0000)

committer Alexey Sokolov <redacted>

Sat, 7 Jan 2023 20:41:48 +0000 (20:41 +0000)
author Alexey Sokolov <redacted>
Sat, 7 Jan 2023 20:41:48 +0000 (20:41 +0000)
committer Alexey Sokolov <redacted>
Sat, 7 Jan 2023 20:41:48 +0000 (20:41 +0000)
diff --cc src/Utils.cpp
Simple merge
diff --cc test/UtilsTest.cpp
Simple merge
author	Alexey Sokolov <redacted>
	Sat, 7 Jan 2023 20:41:48 +0000 (20:41 +0000)
committer	Alexey Sokolov <redacted>
	Sat, 7 Jan 2023 20:41:48 +0000 (20:41 +0000)
		1	2
src/Utils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
test/UtilsTest.cpp	patch \|	diff1 \|	diff2 \|	blob \| history