Merge branch 'develop' into remove-twitter-api

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 76f4bb8f4243d9839d588701b7c035ac74837a89,aaca182ecc1ac5c194abfdb4e86a501585cddc5a..4ec523a4e25f9e938b481f52d9a4527e13aaae18
--- 1/lib/pleroma/web/twitter_api/controllers/util_controller.ex
--- 2/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)