Merge pull request #4168 from annando/comment-dfrn

author Hypolite Petovan <mrpetovan@gmail.com>

Thu, 4 Jan 2018 20:12:07 +0000 (15:12 -0500)

committer GitHub <noreply@github.com>

Thu, 4 Jan 2018 20:12:07 +0000 (15:12 -0500)
author Hypolite Petovan <mrpetovan@gmail.com>
Thu, 4 Jan 2018 20:12:07 +0000 (15:12 -0500)
committer GitHub <noreply@github.com>
Thu, 4 Jan 2018 20:12:07 +0000 (15:12 -0500)
diff --cc include/conversation.php
Simple merge
diff --cc mod/item.php
Simple merge
author	Hypolite Petovan <mrpetovan@gmail.com>
	Thu, 4 Jan 2018 20:12:07 +0000 (15:12 -0500)
committer	GitHub <noreply@github.com>
	Thu, 4 Jan 2018 20:12:07 +0000 (15:12 -0500)
		1	2
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/item.php	patch \|	diff1 \|	diff2 \|	blob \| history