merge

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 42d322f899b5e9672c6b72a958f50a99a94d3b99,7c67bbf1c6f237c1107b6898edf7279716e9d589..f9a6d9c25c8f9953ec9893d8c194cea1fea1344f
--- 1/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
--- 2/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@@ -44,12 -43,9 +44,14 @@@ defmodule Pleroma.Web.Nodeinfo.Nodeinfo
        },
        metadata: %{
          nodeName: Keyword.get(instance, :name),
+         nodeDescription: Keyword.get(instance, :description),
          mediaProxy: Keyword.get(media_proxy, :enabled),
 -        private: !Keyword.get(instance, :public, true)
++        private: !Keyword.get(instance, :public, true),
 +        suggestions: %{
 +          enabled: Keyword.get(suggestions, :enabled, false),
 +          thirdPartyEngine: Keyword.get(suggestions, :third_party_engine, ""),
 +          timeout: Keyword.get(suggestions, :timeout, 5000)
 +        }
        }
      }
  

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