Merge remote-tracking branch 'origin/develop' into reactions

diff --cc test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
index 44ea85b453aa34a96cd0ac9f7d33d19322824d96,7eaeda4a025a48d5b1e1d8ce1c4f2af27709bd8e..3a5dbdeead36b91d250983c2fc7a1f21c970a8df
--- 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,9 -7,7 +7,8 @@@ 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