From: lambda <lain@soykaf.club>
Date: Tue, 7 May 2019 14:43:21 +0000 (+0000)
Subject: Merge branch 'conversations_three' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=238dd72fad2452a8da594e68b8e6c80d709587e8;p=akkoma

Merge branch 'conversations_three' into 'develop'

Conversations once more.

See merge request pleroma/pleroma!1119
---

238dd72fad2452a8da594e68b8e6c80d709587e8
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index b099199af,754946624..be60e5e3c
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@@ -8,8 -8,8 +8,9 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
    alias Pleroma.Activity
    alias Pleroma.Bookmark
    alias Pleroma.Config
+   alias Pleroma.Conversation.Participation
    alias Pleroma.Filter
 +  alias Pleroma.Formatter
    alias Pleroma.Notification
    alias Pleroma.Object
    alias Pleroma.Object.Fetcher