Merge pull request #2299 from annando/1601-contact-photos

author fabrixxm <fabrix.xm@gmail.com>

Fri, 29 Jan 2016 04:26:26 +0000 (05:26 +0100)

committer fabrixxm <fabrix.xm@gmail.com>

Fri, 29 Jan 2016 04:26:26 +0000 (05:26 +0100)
author fabrixxm <fabrix.xm@gmail.com>
Fri, 29 Jan 2016 04:26:26 +0000 (05:26 +0100)
committer fabrixxm <fabrix.xm@gmail.com>
Fri, 29 Jan 2016 04:26:26 +0000 (05:26 +0100)
diff --cc include/diaspora.php
Simple merge
diff --cc include/ostatus.php
Simple merge
author	fabrixxm <fabrix.xm@gmail.com>
	Fri, 29 Jan 2016 04:26:26 +0000 (05:26 +0100)
committer	fabrixxm <fabrix.xm@gmail.com>
	Fri, 29 Jan 2016 04:26:26 +0000 (05:26 +0100)
		1	2
include/diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/ostatus.php	patch \|	diff1 \|	diff2 \|	blob \| history