merge

diff --cc .gitignore
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 6ccdf2a53ff2ba243e37b6cdebe26657e19e73c2,69ec27ba05f1979ebeab7b040aab23bde9b82a29..df3ccc23ba56ee4f4f46bf8dcffca979b7fb1336
--- 1/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
--- 2/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 = %{