From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 23 Dec 2019 19:03:47 +0000 (+0100)
Subject: Merge branch 'master' 2019.12 into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00756737b54e00dc5dc3c74ebc5c3e92a5dd97ff;p=friendica.git

Merge branch 'master' 2019.12 into develop
---

00756737b54e00dc5dc3c74ebc5c3e92a5dd97ff
diff --cc tests/include/ApiTest.php
index ef46a4d447,3d6bdc0c16..c54135faee
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@@ -11,10 -11,9 +11,11 @@@ use Friendica\BaseObject
  use Friendica\Core\Config\Configuration;
  use Friendica\Core\Config\PConfiguration;
  use Friendica\Core\Protocol;
 +use Friendica\Core\Session;
 +use Friendica\Core\Session\ISession;
  use Friendica\Core\System;
  use Friendica\Database\Database;
+ use Friendica\Model\Contact;
  use Friendica\Network\HTTPException;
  use Friendica\Test\Util\Database\StaticDatabase;
  use Monolog\Handler\TestHandler;