diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 17:53:15 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 17:53:15 +0700 |
| commit | cfa5572d28a5a7b58d73106c32420b14ffd9fd2a (patch) | |
| tree | d093f206f5ea5b792b22b0e59b31b76ac64c1bc6 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 6ba9055b51a454baaf063943e72a39006f7e5fad (diff) | |
| parent | e4babb1c9ff4c28ff08888736cc330a48b19b396 (diff) | |
| download | pleroma-cfa5572d28a5a7b58d73106c32420b14ffd9fd2a.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
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 57f5b61bb..32be430b7 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -98,6 +98,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do "mastodon_api", "mastodon_api_streaming", "polls", + "pleroma_explicit_addressing", if Config.get([:media_proxy, :enabled]) do "media_proxy" end, |