Merge commit 'b931bbd0c30907b9cc956d3707b26b449bf41f76'

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

Sun, 14 Jan 2024 21:21:33 +0000 (22:21 +0100)

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

Sun, 14 Jan 2024 21:21:33 +0000 (22:21 +0100)
author Paul Hänsch <paul@plutz.net>
Sun, 14 Jan 2024 21:21:33 +0000 (22:21 +0100)
committer Paul Hänsch <paul@plutz.net>
Sun, 14 Jan 2024 21:21:33 +0000 (22:21 +0100)
diff --cc cgilite/common.css
Simple merge
diff --cc cgilite/file.sh
Simple merge
diff --cc cgilite/users.sh
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Sun, 14 Jan 2024 21:21:33 +0000 (22:21 +0100)
committer	Paul Hänsch <paul@plutz.net>
	Sun, 14 Jan 2024 21:21:33 +0000 (22:21 +0100)
		1	2
cgilite/common.css	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/file.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/users.sh	patch \|	diff1 \|	diff2 \|	blob \| history