From: sadposter <hannah+pleroma@coffee-and-dreams.uk>
Date: Sun, 27 Jun 2021 21:31:37 +0000 (+0100)
Subject: merge
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e56c319e8f4c121c5a3c014ac0b2e3567bfa636b;p=akkoma

merge
---

e56c319e8f4c121c5a3c014ac0b2e3567bfa636b
diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 6ccdf2a53,69ec27ba0..df3ccc23b
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@@ -5,12 -5,8 +5,14 @@@
  defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
    use Pleroma.Web, :controller
  
 +  alias Pleroma.Config
 +  alias Pleroma.Stats
 +  alias Pleroma.User
 +  alias Pleroma.Web
 +  alias Pleroma.Web.Federator.Publisher
 +  alias Pleroma.Web.MastodonAPI.InstanceView
+   alias Pleroma.Web.Endpoint
+   alias Pleroma.Web.Nodeinfo.Nodeinfo
  
    def schemas(conn, _params) do
      response = %{