Merge commit '69f8408db61b6f4905f7e4af03faa473ab435451'

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

Mon, 13 Sep 2021 17:29:46 +0000 (19:29 +0200)

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

Mon, 13 Sep 2021 17:29:46 +0000 (19:29 +0200)
author Paul Hänsch <paul@plutz.net>
Mon, 13 Sep 2021 17:29:46 +0000 (19:29 +0200)
committer Paul Hänsch <paul@plutz.net>
Mon, 13 Sep 2021 17:29:46 +0000 (19:29 +0200)
diff --cc cgilite/cgilite.sh
Simple merge
diff --cc cgilite/session.sh
Simple merge
diff --cc cgilite/storage.sh
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Mon, 13 Sep 2021 17:29:46 +0000 (19:29 +0200)
committer	Paul Hänsch <paul@plutz.net>
	Mon, 13 Sep 2021 17:29:46 +0000 (19:29 +0200)
		1	2
cgilite/cgilite.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/session.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/storage.sh	patch \|	diff1 \|	diff2 \|	blob \| history