Merge branch 'no-term3' into no-term2

diff --cc src/Protocol/DFRN.php
Simple merge

diff --cc src/Protocol/OStatus.php
Simple merge

diff --cc src/Worker/Notifier.php
index b93b1dd74b094fb8998f895449762d94a66731f6,09470c31851d3e37bbaf2b2829e36203853cacd9..34a4cdc023f37c825690a7b0822f5e2dae6b6e7d
--- 1/src/Worker/Notifier.php
--- 2/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@@ -32,8 -32,9 +32,9 @@@ use Friendica\Model\Contact
  use Friendica\Model\Conversation;
  use Friendica\Model\Group;
  use Friendica\Model\Item;
 -use Friendica\Model\ItemDeliveryData;
 +use Friendica\Model\Post;
  use Friendica\Model\PushSubscriber;
+ use Friendica\Model\Tag;
  use Friendica\Model\User;
  use Friendica\Network\Probe;
  use Friendica\Protocol\ActivityPub;