From: Michael <heluecht@pirati.ca>
Date: Fri, 30 Mar 2018 05:45:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into dfrn-2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c9f02d534e2016acf18d7fa18db193d056495841;p=friendica.git

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

c9f02d534e2016acf18d7fa18db193d056495841
diff --cc mod/dfrn_notify.php
index 0743b21435,073226b829..a9dbcd2633
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@@ -12,10 -12,8 +12,9 @@@ use Friendica\Core\System
  use Friendica\Database\DBM;
  use Friendica\Model\Contact;
  use Friendica\Protocol\DFRN;
 +use Friendica\Protocol\Diaspora;
  
  require_once 'include/items.php';
- require_once 'include/event.php';
  
  function dfrn_notify_post(App $a) {
  	logger(__function__, LOGGER_TRACE);