diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-11-14 16:39:45 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-11-14 16:39:45 +0700 |
| commit | 3c0abfca53751624ebd6ea7174ee880d9e7b29e7 (patch) | |
| tree | ba16c5af44532a9b76640f1f48651c90d1be8a6f /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 768c1a5de172151beb34e6dda13d4fb05e05ed87 (diff) | |
| parent | 6085c71bd17e2b676e0820bf3fd93f81a1902ac3 (diff) | |
| download | pleroma-3c0abfca53751624ebd6ea7174ee880d9e7b29e7.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 192984242..486b9f6a4 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -46,6 +46,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do data |> Map.merge(%{quarantined_instances: quarantined}) + |> Map.put(:enabled, Config.get([:instance, :federating])) else %{} end @@ -58,6 +59,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do "polls", "pleroma_explicit_addressing", "shareable_emoji_packs", + "multifetch", if Config.get([:media_proxy, :enabled]) do "media_proxy" end, |