From: lain <lain@soykaf.club>
Date: Wed, 1 May 2019 16:40:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into conversations_three
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=45f790becc2cc63ac000c6432fe8c84e0b589822;p=akkoma

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

45f790becc2cc63ac000c6432fe8c84e0b589822
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index d5b6a943f,ed585098a..aa3f46482
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@@ -4,11 -4,10 +4,11 @@@
  
  defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
    use Pleroma.Web, :controller
- 
    alias Ecto.Changeset
    alias Pleroma.Activity
+   alias Pleroma.Bookmark
    alias Pleroma.Config
 +  alias Pleroma.Conversation.Participation
    alias Pleroma.Filter
    alias Pleroma.Notification
    alias Pleroma.Object