Merge remote-tracking branch 'upstream/develop' into parent-view

author Michael <heluecht@pirati.ca>

Mon, 29 May 2023 06:53:02 +0000 (06:53 +0000)

committer Michael <heluecht@pirati.ca>

Mon, 29 May 2023 06:53:02 +0000 (06:53 +0000)
author Michael <heluecht@pirati.ca>
Mon, 29 May 2023 06:53:02 +0000 (06:53 +0000)
committer Michael <heluecht@pirati.ca>
Mon, 29 May 2023 06:53:02 +0000 (06:53 +0000)
diff --cc database.sql
Simple merge
diff --cc src/Module/Contact/Profile.php
Simple merge
diff --cc static/dbstructure.config.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Mon, 29 May 2023 06:53:02 +0000 (06:53 +0000)
committer	Michael <heluecht@pirati.ca>
	Mon, 29 May 2023 06:53:02 +0000 (06:53 +0000)
		1	2
database.sql	patch \|	diff1 \|	diff2 \|	blob \| history
src/Module/Contact/Profile.php	patch \|	diff1 \|	diff2 \|	blob \| history
static/dbstructure.config.php	patch \|	diff1 \|	diff2 \|	blob \| history