logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 0929d06e6995d937161c46363720b6e0511cdd6f
parent: aa3551ebd2b6bd82eff79cdd081718df91d0e8d8
Author: kaniini <ariadne@dereferenced.org>
Date:   Fri,  8 Nov 2019 19:08:39 +0000

Merge branch 'chore/add-multifetch' into 'develop'

nodeinfo: add multifetch feature (ref pleroma-fe!977).

See merge request pleroma/pleroma!1952

Diffstat:

Mlib/pleroma/web/nodeinfo/nodeinfo_controller.ex1+
1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -58,6 +58,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,