Merge commit 'c15fd72ed0c779b872360a2546ff60767772d8ee'

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

Mon, 19 Jun 2023 13:32:26 +0000 (15:32 +0200)

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

Mon, 19 Jun 2023 13:32:26 +0000 (15:32 +0200)
author Paul Hänsch <paul@plutz.net>
Mon, 19 Jun 2023 13:32:26 +0000 (15:32 +0200)
committer Paul Hänsch <paul@plutz.net>
Mon, 19 Jun 2023 13:32:26 +0000 (15:32 +0200)
diff --cc cgilite/cgilite.sh
Simple merge
diff --cc cgilite/markdown.awk
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Mon, 19 Jun 2023 13:32:26 +0000 (15:32 +0200)
committer	Paul Hänsch <paul@plutz.net>
	Mon, 19 Jun 2023 13:32:26 +0000 (15:32 +0200)
		1	2
cgilite/cgilite.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/markdown.awk	patch \|	diff1 \|	diff2 \|	blob \| history