From: lain <lain@soykaf.club>
Date: Sun, 6 Oct 2019 08:11:47 +0000 (+0000)
Subject: Merge branch 'develop' into 'reactions'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=61097ba6ab1f40f8a885f1adc96455b3c82cfd9b;p=akkoma

Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md
---

61097ba6ab1f40f8a885f1adc96455b3c82cfd9b
diff --cc test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
index 3a5dbdeea,8a6528cbb..44ea85b45
--- a/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