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

This commit is contained in:
Michael 2017-12-27 15:51:36 +00:00
commit d7039c6862
2 changed files with 3 additions and 0 deletions

View File

@ -13,6 +13,7 @@ use Friendica\Network\Probe;
require_once 'include/contact_selectors.php';
require_once 'mod/proxy.php';
require_once 'include/follow.php';
function contacts_init(App $a) {
if (! local_user()) {

View File

@ -4,6 +4,8 @@ use Friendica\App;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
require_once 'include/follow.php';
function fsuggest_post(App $a) {
if (! local_user()) {