Merge commit '11ee170457db15ac24e30a97c7fb555972da83b7'

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

Thu, 10 Mar 2022 23:55:07 +0000 (00:55 +0100)

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

Thu, 10 Mar 2022 23:55:07 +0000 (00:55 +0100)
author Paul Hänsch <paul@plutz.net>
Thu, 10 Mar 2022 23:55:07 +0000 (00:55 +0100)
committer Paul Hänsch <paul@plutz.net>
Thu, 10 Mar 2022 23:55:07 +0000 (00:55 +0100)
diff --cc cgilite/common.css
Simple merge
diff --cc cgilite/markdown.awk
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Thu, 10 Mar 2022 23:55:07 +0000 (00:55 +0100)
committer	Paul Hänsch <paul@plutz.net>
	Thu, 10 Mar 2022 23:55:07 +0000 (00:55 +0100)
		1	2
cgilite/common.css	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/markdown.awk	patch \|	diff1 \|	diff2 \|	blob \| history