Merge branch 'hotfix_diaspora' into develop

author Fabrixxm <fabrix.xm@gmail.com>

Wed, 20 Jan 2016 07:50:18 +0000 (08:50 +0100)

committer Fabrixxm <fabrix.xm@gmail.com>

Wed, 20 Jan 2016 07:50:18 +0000 (08:50 +0100)
author Fabrixxm <fabrix.xm@gmail.com>
Wed, 20 Jan 2016 07:50:18 +0000 (08:50 +0100)
committer Fabrixxm <fabrix.xm@gmail.com>
Wed, 20 Jan 2016 07:50:18 +0000 (08:50 +0100)
diff --cc include/diaspora.php
Simple merge
diff --cc include/items.php
Simple merge
diff --cc include/notifier.php
Simple merge
diff --cc mod/item.php
Simple merge
author	Fabrixxm <fabrix.xm@gmail.com>
	Wed, 20 Jan 2016 07:50:18 +0000 (08:50 +0100)
committer	Fabrixxm <fabrix.xm@gmail.com>
	Wed, 20 Jan 2016 07:50:18 +0000 (08:50 +0100)
		1	2
include/diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/items.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/notifier.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/item.php	patch \|	diff1 \|	diff2 \|	blob \| history