Merge remote-tracking branch 'upstream/develop' into logging

author Michael <heluecht@pirati.ca>

Fri, 22 Oct 2021 06:06:39 +0000 (06:06 +0000)

committer Michael <heluecht@pirati.ca>

Fri, 22 Oct 2021 06:06:39 +0000 (06:06 +0000)
author Michael <heluecht@pirati.ca>
Fri, 22 Oct 2021 06:06:39 +0000 (06:06 +0000)
committer Michael <heluecht@pirati.ca>
Fri, 22 Oct 2021 06:06:39 +0000 (06:06 +0000)
diff --cc src/Model/Contact.php
Simple merge
diff --cc src/Protocol/DFRN.php
Simple merge
diff --cc view/theme/frio/theme.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Fri, 22 Oct 2021 06:06:39 +0000 (06:06 +0000)
committer	Michael <heluecht@pirati.ca>
	Fri, 22 Oct 2021 06:06:39 +0000 (06:06 +0000)
		1	2
src/Model/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/DFRN.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/frio/theme.php	patch \|	diff1 \|	diff2 \|	blob \| history