diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-11-08 19:08:39 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-11-08 19:08:39 +0000 |
| commit | 0929d06e6995d937161c46363720b6e0511cdd6f (patch) | |
| tree | 1c4ae1d8d7bd81602d90f45981f9dba23183aac5 /lib | |
| parent | aa3551ebd2b6bd82eff79cdd081718df91d0e8d8 (diff) | |
| parent | 532fd38b123b94e6a60387bd8c8409e50913e81a (diff) | |
| download | pleroma-0929d06e6995d937161c46363720b6e0511cdd6f.tar.gz | |
Merge branch 'chore/add-multifetch' into 'develop'
nodeinfo: add multifetch feature (ref pleroma-fe!977).
See merge request pleroma/pleroma!1952
Diffstat (limited to 'lib')
| -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 192984242..d7ae503f6 100644 --- 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, |