diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-14 15:01:09 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-14 15:01:09 +0000 |
| commit | ecb3386f939de3ffba16f9419994a009f2e59ded (patch) | |
| tree | febe52f1b2cf59be4530ebc4f223f06e342c207c /lib/pleroma/web/nodeinfo | |
| parent | 0ba3f1ffb28792c21809fa9a30fc03a7a52d9361 (diff) | |
| parent | 3b407a9a295da3f6c2fc91982088f066f2c3c711 (diff) | |
| download | pleroma-1.1.7.tar.gz | |
Merge branch 'release/1.1.7' into 'stable'v1.1.7
Release/1.1.7
See merge request pleroma/pleroma!2065
Diffstat (limited to 'lib/pleroma/web/nodeinfo')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index ee14cfd6b..09cd65b78 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 |