From: Michael <heluecht@pirati.ca>
Date: Mon, 3 Aug 2020 18:00:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into contact-tabs
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=879c30d4facb040d8579b9e378fbdd3ea14b8d88;p=friendica.git

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

879c30d4facb040d8579b9e378fbdd3ea14b8d88
diff --cc src/Model/GContact.php
index 1650123c73,3051202689..78583bcc5a
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@@ -22,7 -22,10 +22,9 @@@
  namespace Friendica\Model;
  
  use Exception;
 -use Friendica\Core\Protocol;
  use Friendica\Database\DBA;
+ use Friendica\DI;
+ use Friendica\Util\DateTimeFormat;
  
  /**
   * This class handles GlobalContact related functions