Merge pull request #10721 from annando/issue-10720-avatar

author Hypolite Petovan <hypolite@mrpetovan.com>

Sat, 18 Sep 2021 13:30:08 +0000 (09:30 -0400)

committer GitHub <noreply@github.com>

Sat, 18 Sep 2021 13:30:08 +0000 (09:30 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Sat, 18 Sep 2021 13:30:08 +0000 (09:30 -0400)
committer GitHub <noreply@github.com>
Sat, 18 Sep 2021 13:30:08 +0000 (09:30 -0400)
diff --cc src/Model/Contact.php
Simple merge
diff --cc src/Protocol/DFRN.php
Simple merge
diff --cc src/Protocol/OStatus.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Sat, 18 Sep 2021 13:30:08 +0000 (09:30 -0400)
committer	GitHub <noreply@github.com>
	Sat, 18 Sep 2021 13:30:08 +0000 (09:30 -0400)
		1	2
src/Model/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/DFRN.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/OStatus.php	patch \|	diff1 \|	diff2 \|	blob \| history