Merge remote-tracking branch 'upstream/develop' into channel-relay

author Michael <heluecht@pirati.ca>

Mon, 15 Jan 2024 19:51:20 +0000 (19:51 +0000)

committer Michael <heluecht@pirati.ca>

Mon, 15 Jan 2024 19:51:20 +0000 (19:51 +0000)
author Michael <heluecht@pirati.ca>
Mon, 15 Jan 2024 19:51:20 +0000 (19:51 +0000)
committer Michael <heluecht@pirati.ca>
Mon, 15 Jan 2024 19:51:20 +0000 (19:51 +0000)
diff --cc src/Model/Contact.php
Simple merge
diff --cc src/Model/User.php
Simple merge
diff --cc view/lang/C/messages.po
Simple merge
author	Michael <heluecht@pirati.ca>
	Mon, 15 Jan 2024 19:51:20 +0000 (19:51 +0000)
committer	Michael <heluecht@pirati.ca>
	Mon, 15 Jan 2024 19:51:20 +0000 (19:51 +0000)
		1	2
src/Model/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/lang/C/messages.po	patch \|	diff1 \|	diff2 \|	blob \| history