Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge

diff --cc lib/pleroma/web/common_api/common_api.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge

diff --cc test/web/common_api/common_api_test.exs
Simple merge

diff --cc test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
index 3a5dbdeead36b91d250983c2fc7a1f21c970a8df,8a6528cbb1b5b874a14240cbfa948d115fcb175b..44ea85b453aa34a96cd0ac9f7d33d19322824d96
--- 1/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
--- 2/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
@@@ -7,8 -7,8 +7,9 @@@ defmodule Pleroma.Web.PleromaAPI.Plerom
  
    alias Pleroma.Conversation.Participation
    alias Pleroma.Notification
 +  alias Pleroma.Object
    alias Pleroma.Repo
+   alias Pleroma.User
    alias Pleroma.Web.CommonAPI
  
    import Pleroma.Factory