Merge remote-tracking branch 'upstream/develop' into issue-13845

author Michael <heluecht@pirati.ca>

Mon, 5 Feb 2024 06:31:08 +0000 (06:31 +0000)

committer Michael <heluecht@pirati.ca>

Mon, 5 Feb 2024 06:31:08 +0000 (06:31 +0000)
author Michael <heluecht@pirati.ca>
Mon, 5 Feb 2024 06:31:08 +0000 (06:31 +0000)
committer Michael <heluecht@pirati.ca>
Mon, 5 Feb 2024 06:31:08 +0000 (06:31 +0000)
diff --cc database.sql
Simple merge
diff --cc static/dbview.config.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Mon, 5 Feb 2024 06:31:08 +0000 (06:31 +0000)
committer	Michael <heluecht@pirati.ca>
	Mon, 5 Feb 2024 06:31:08 +0000 (06:31 +0000)
		1	2
database.sql	patch \|	diff1 \|	diff2 \|	blob \| history
static/dbview.config.php	patch \|	diff1 \|	diff2 \|	blob \| history