From: lain <lain@soykaf.club>
Date: Sat, 5 Oct 2019 13:10:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into reactions
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1ed8fbc4d96c1d44ab968d6aa1b0069c55e44626;p=akkoma

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

1ed8fbc4d96c1d44ab968d6aa1b0069c55e44626
diff --cc test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
index 44ea85b45,7eaeda4a0..3a5dbdeea
--- a/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