Merge remote-tracking branch 'upstream/develop' into comment-public
This commit is contained in:
commit
d7039c6862
|
@ -13,6 +13,7 @@ use Friendica\Network\Probe;
|
||||||
|
|
||||||
require_once 'include/contact_selectors.php';
|
require_once 'include/contact_selectors.php';
|
||||||
require_once 'mod/proxy.php';
|
require_once 'mod/proxy.php';
|
||||||
|
require_once 'include/follow.php';
|
||||||
|
|
||||||
function contacts_init(App $a) {
|
function contacts_init(App $a) {
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
|
|
|
@ -4,6 +4,8 @@ use Friendica\App;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\Database\DBM;
|
use Friendica\Database\DBM;
|
||||||
|
|
||||||
|
require_once 'include/follow.php';
|
||||||
|
|
||||||
function fsuggest_post(App $a) {
|
function fsuggest_post(App $a) {
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
|
|
Loading…
Reference in a new issue