Merge remote-tracking branches 'origin/pull/141/head', 'origin/pull/142/head', 'origi...

author Ed Kellett <redacted>

Mon, 12 Apr 2021 16:21:24 +0000 (17:21 +0100)

committer Ed Kellett <redacted>

Mon, 12 Apr 2021 16:21:24 +0000 (17:21 +0100)
author Ed Kellett <redacted>
Mon, 12 Apr 2021 16:21:24 +0000 (17:21 +0100)
committer Ed Kellett <redacted>
Mon, 12 Apr 2021 16:21:24 +0000 (17:21 +0100)
diff --cc include/messages.h
Simple merge
diff --cc ircd/s_serv.c
Simple merge
diff --cc modules/m_kline.c
Simple merge
author	Ed Kellett <redacted>
	Mon, 12 Apr 2021 16:21:24 +0000 (17:21 +0100)
committer	Ed Kellett <redacted>
	Mon, 12 Apr 2021 16:21:24 +0000 (17:21 +0100)
		1	2	3	4	5	6
include/messages.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
ircd/s_serv.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
modules/m_kline.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history