Merge branch 'master' into 2.2.dev

author Will Budicm <redacted>

Thu, 24 Dec 2020 06:05:59 +0000 (17:05 +1100)

committer Will Budicm <redacted>

Thu, 24 Dec 2020 06:05:59 +0000 (17:05 +1100)
author Will Budicm <redacted>
Thu, 24 Dec 2020 06:05:59 +0000 (17:05 +1100)
committer Will Budicm <redacted>
Thu, 24 Dec 2020 06:05:59 +0000 (17:05 +1100)
diff --cc dbLifeLog/main.cnf
Simple merge
diff --cc htdocs/cgi-bin/system/modules/Settings.pm
Simple merge
author	Will Budicm <redacted>
	Thu, 24 Dec 2020 06:05:59 +0000 (17:05 +1100)
committer	Will Budicm <redacted>
	Thu, 24 Dec 2020 06:05:59 +0000 (17:05 +1100)
		1	2
dbLifeLog/main.cnf	patch \|	diff1 \|	diff2 \|	blob \| history
htdocs/cgi-bin/system/modules/Settings.pm	patch \|	diff1 \|	diff2 \|	blob \| history