Merge commit 'f2e63f9ef2a8af259d244f87709fd0a08c42b190'

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

Mon, 4 Jan 2021 17:34:35 +0000 (18:34 +0100)

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

Mon, 4 Jan 2021 17:34:35 +0000 (18:34 +0100)
author Paul Hänsch <paul@plutz.net>
Mon, 4 Jan 2021 17:34:35 +0000 (18:34 +0100)
committer Paul Hänsch <paul@plutz.net>
Mon, 4 Jan 2021 17:34:35 +0000 (18:34 +0100)
diff --cc cgilite/cgilite.sh
Simple merge
diff --cc cgilite/file.sh
Simple merge
diff --cc cgilite/session.sh
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Mon, 4 Jan 2021 17:34:35 +0000 (18:34 +0100)
committer	Paul Hänsch <paul@plutz.net>
	Mon, 4 Jan 2021 17:34:35 +0000 (18:34 +0100)
		1	2
cgilite/cgilite.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/file.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/session.sh	patch \|	diff1 \|	diff2 \|	blob \| history