Merge commit 'be3b0b1f0ea6b499b79122bcf159b5a2d7d92228'

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

Sun, 20 Aug 2023 14:05:52 +0000 (16:05 +0200)

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

Sun, 20 Aug 2023 14:05:52 +0000 (16:05 +0200)
author Paul Hänsch <paul@plutz.net>
Sun, 20 Aug 2023 14:05:52 +0000 (16:05 +0200)
committer Paul Hänsch <paul@plutz.net>
Sun, 20 Aug 2023 14:05:52 +0000 (16:05 +0200)
diff --cc cgilite/common.css
Simple merge
diff --cc cgilite/markdown.awk
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Sun, 20 Aug 2023 14:05:52 +0000 (16:05 +0200)
committer	Paul Hänsch <paul@plutz.net>
	Sun, 20 Aug 2023 14:05:52 +0000 (16:05 +0200)
		1	2
cgilite/common.css	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/markdown.awk	patch \|	diff1 \|	diff2 \|	blob \| history