Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 16:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2016-12-30 21:33:41 +01:00
commit d2280d4120
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
18 changed files with 503 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/socgraph.php
View file

@ -1188,7 +1188,7 @@ function update_suggestions() {
$done = array();
/// TODO Check if it is really neccessary to poll the own server
/// @TODO Check if it is really neccessary to poll the own server
poco_load(0,0,0,App::get_baseurl() . '/poco');
$done[] = App::get_baseurl() . '/poco';