# Conflicts: # ActivityPubPlugin.php # classes/Activitypub_attachment.php # classes/Activitypub_notice.php