Merge branch 'master' into v2.1

author Mike Pall <mike>

Thu, 11 Mar 2021 14:33:44 +0000 (15:33 +0100)

committer Mike Pall <mike>

Thu, 11 Mar 2021 14:33:44 +0000 (15:33 +0100)
author Mike Pall <mike>
Thu, 11 Mar 2021 14:33:44 +0000 (15:33 +0100)
committer Mike Pall <mike>
Thu, 11 Mar 2021 14:33:44 +0000 (15:33 +0100)
diff --cc doc/install.html
Simple merge
diff --cc doc/running.html
Simple merge
		1	2
doc/install.html	patch \|	diff1 \|	diff2 \|	blob \| history
doc/running.html	patch \|	diff1 \|	diff2 \|	blob \| history