Merge commit '1f887be68c8e777cdaa6853eb942f7b691bc1e4e'

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

Tue, 17 May 2022 23:27:06 +0000 (01:27 +0200)

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

Tue, 17 May 2022 23:27:06 +0000 (01:27 +0200)
author Paul Hänsch <paul@plutz.net>
Tue, 17 May 2022 23:27:06 +0000 (01:27 +0200)
committer Paul Hänsch <paul@plutz.net>
Tue, 17 May 2022 23:27:06 +0000 (01:27 +0200)
diff --cc cgilite/common.css
Simple merge
diff --cc cgilite/markdown.awk
Simple merge
diff --cc cgilite/users.sh
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Tue, 17 May 2022 23:27:06 +0000 (01:27 +0200)
committer	Paul Hänsch <paul@plutz.net>
	Tue, 17 May 2022 23:27:06 +0000 (01:27 +0200)
		1	2
cgilite/common.css	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/markdown.awk	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/users.sh	patch \|	diff1 \|	diff2 \|	blob \| history