diff options
| author | lain <lain@soykaf.club> | 2019-11-10 11:32:50 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-10 11:32:50 +0000 |
| commit | a88e834dbadcd3485a6187d512865ab95bb9c1f0 (patch) | |
| tree | 15f0d2449c7dc39337d725d74e6b097fc6256ddb /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | b22ee9d9666c49d1a3b1757b275e9d303eed4afc (diff) | |
| parent | 3a1aaadc18372fb8c76fa72cd20ed65dd85b2326 (diff) | |
| download | pleroma-a88e834dbadcd3485a6187d512865ab95bb9c1f0.tar.gz | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
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 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, |