Merge pull request #10348 from annando/fix-diaspora-comment

author Hypolite Petovan <hypolite@mrpetovan.com>

Mon, 31 May 2021 23:27:53 +0000 (19:27 -0400)

committer GitHub <noreply@github.com>

Mon, 31 May 2021 23:27:53 +0000 (19:27 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Mon, 31 May 2021 23:27:53 +0000 (19:27 -0400)
committer GitHub <noreply@github.com>
Mon, 31 May 2021 23:27:53 +0000 (19:27 -0400)
diff --cc mod/item.php
Simple merge
diff --cc src/Model/Item.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Mon, 31 May 2021 23:27:53 +0000 (19:27 -0400)
committer	GitHub <noreply@github.com>
	Mon, 31 May 2021 23:27:53 +0000 (19:27 -0400)
		1	2
mod/item.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/Item.php	patch \|	diff1 \|	diff2 \|	blob \| history