From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 29 Jun 2020 12:09:49 +0000 (+0400)
Subject: Merge branch 'develop' into remove-twitter-api
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4a306720e8be8633e192f7b2c98f129a315939b9;p=akkoma

Merge branch 'develop' into remove-twitter-api
---

4a306720e8be8633e192f7b2c98f129a315939b9
diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 76f4bb8f4,aaca182ec..4ec523a4e
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@@ -13,7 -13,9 +13,8 @@@ defmodule Pleroma.Web.TwitterAPI.UtilCo
    alias Pleroma.Notification
    alias Pleroma.Plugs.OAuthScopesPlug
    alias Pleroma.User
 -  alias Pleroma.Web
    alias Pleroma.Web.CommonAPI
+   alias Pleroma.Web.TwitterAPI.UtilView
    alias Pleroma.Web.WebFinger
  
    plug(Pleroma.Web.FederatingPlug when action == :remote_subscribe)