diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-18 17:46:09 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-18 17:46:09 +0300 |
| commit | 61d9f43e463a3b3b0c1e4b9c98c22e222797bd82 (patch) | |
| tree | d0db351126377c4a648155df4dfdfd4358874b9c /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 269d592181bff8601f6545b85158ee1c222ff20d (diff) | |
| parent | 3fa2ac68df10f6ffe3c1ea76fa10c30da90f4bd0 (diff) | |
| download | pleroma-61d9f43e463a3b3b0c1e4b9c98c22e222797bd82.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 03c35cc2a..333012920 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -46,10 +46,10 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do data |> Map.merge(%{quarantined_instances: quarantined}) - |> Map.put(:enabled, Config.get([:instance, :federating])) else %{} end + |> Map.put(:enabled, Config.get([:instance, :federating])) features = [ |