Merge branch 'conversations_three' into 'develop'

Conversations once more.

See merge request pleroma/pleroma!1119

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index b099199afd37f88af4ca3437ed17e87e58e9baa9,75494662479874d9271fb914a340b108e525ab0c..be60e5e3c4cecd110643d4e24d51bbf571b59ae6
--- 1/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
--- 2/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

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge