Merge commit '9a10fd447c5646456421bc7c0107bf930f3acbf8'

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

Mon, 23 Aug 2021 12:34:20 +0000 (14:34 +0200)

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

Mon, 23 Aug 2021 12:34:20 +0000 (14:34 +0200)
author Paul Hänsch <paul@plutz.net>
Mon, 23 Aug 2021 12:34:20 +0000 (14:34 +0200)
committer Paul Hänsch <paul@plutz.net>
Mon, 23 Aug 2021 12:34:20 +0000 (14:34 +0200)
diff --cc cgilite/cgilite.sh
Simple merge
diff --cc cgilite/file.sh
Simple merge
diff --cc cgilite/markdown.awk
Simple merge
diff --cc cgilite/session.sh
Simple merge
diff --cc cgilite/storage.sh
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Mon, 23 Aug 2021 12:34:20 +0000 (14:34 +0200)
committer	Paul Hänsch <paul@plutz.net>
	Mon, 23 Aug 2021 12:34:20 +0000 (14:34 +0200)
		1	2
cgilite/cgilite.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/file.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/markdown.awk	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/session.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/storage.sh	patch \|	diff1 \|	diff2 \|	blob \| history