tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
This commit is contained in:
Roland Häder 2016-12-22 11:33:00 +01:00
commit ad20c5504d
16 changed files with 174 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/notifier.php
View file

@ -571,7 +571,7 @@ function notifier_run(&$argv, &$argc){
if($public_message) {
if (!$followup)
$r0 = diaspora::relay_list();
$r0 = Diaspora::relay_list();
else
$r0 = array();