diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-15 21:40:14 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-15 21:40:14 +0300 |
| commit | 01d9c093c3fa06784ee24039c69b16e400dd0ebf (patch) | |
| tree | ad013076e4b54a242fd895550a0fe50a1786f9b9 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | c31ddce51ea18f052c1c3ad30a221b77c7a94e71 (diff) | |
| parent | 22554ac5ca056c2db627fc2daa5ffc8710be5c89 (diff) | |
| download | pleroma-01d9c093c3fa06784ee24039c69b16e400dd0ebf.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -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 d7ae503f6..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 |