Merge pull request #2979 from annando/issue-2772

author Tobias Diekershoff <tobias.diekershoff@gmx.net>

Thu, 1 Dec 2016 07:51:04 +0000 (08:51 +0100)

committer GitHub <noreply@github.com>

Thu, 1 Dec 2016 07:51:04 +0000 (08:51 +0100)
author Tobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 1 Dec 2016 07:51:04 +0000 (08:51 +0100)
committer GitHub <noreply@github.com>
Thu, 1 Dec 2016 07:51:04 +0000 (08:51 +0100)
diff --cc include/conversation.php
Simple merge
diff --cc include/dfrn.php
Simple merge
author	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Thu, 1 Dec 2016 07:51:04 +0000 (08:51 +0100)
committer	GitHub <noreply@github.com>
	Thu, 1 Dec 2016 07:51:04 +0000 (08:51 +0100)
		1	2
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/dfrn.php	patch \|	diff1 \|	diff2 \|	blob \| history