diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-11 19:18:12 +0900 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-11 19:18:12 +0900 |
| commit | 46787b9fe1c61d5139198187a0d2013f1a2e5162 (patch) | |
| tree | bdf3e1f3b42aba52f18d0be18910c841dc0c0e25 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 1649d6f6894bbb2c36095d34eddd17d2e5f8d9df (diff) | |
| parent | 7438c177d9f57e8779b979ca553c3b501726efb3 (diff) | |
| download | pleroma-46787b9fe1c61d5139198187a0d2013f1a2e5162.tar.gz | |
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
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, |