Merge commit '178c015a44368ed1aa2e400ddc5f52c84944b196'

author Paul Hänsch <paul@plutz.net>

Thu, 7 Oct 2021 22:32:28 +0000 (00:32 +0200)

committer Paul Hänsch <paul@plutz.net>

Thu, 7 Oct 2021 22:32:28 +0000 (00:32 +0200)
author Paul Hänsch <paul@plutz.net>
Thu, 7 Oct 2021 22:32:28 +0000 (00:32 +0200)
committer Paul Hänsch <paul@plutz.net>
Thu, 7 Oct 2021 22:32:28 +0000 (00:32 +0200)
diff --cc cgilite/cgilite.sh
Simple merge
diff --cc cgilite/users.sh
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Thu, 7 Oct 2021 22:32:28 +0000 (00:32 +0200)
committer	Paul Hänsch <paul@plutz.net>
	Thu, 7 Oct 2021 22:32:28 +0000 (00:32 +0200)
		1	2
cgilite/cgilite.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/users.sh	patch \|	diff1 \|	diff2 \|	blob \| history