diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-14 23:45:29 +0900 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-14 23:45:29 +0900 |
| commit | 114930b5fd816657c21c5fbe33845fd3742c9c23 (patch) | |
| tree | 8048239cc3562033dba47db9308159c25a177c18 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 30af5da33043192dff626e869f2628ffc709f836 (diff) | |
| parent | 09b4f7269e5307f29fc8ca7b548e93cd93836dc5 (diff) | |
| download | pleroma-114930b5fd816657c21c5fbe33845fd3742c9c23.tar.gz | |
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
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 |