diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-25 12:24:12 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-25 12:24:12 +0300 |
| commit | 1a858134edabfe9a85e07fb801b9ed41649ba08a (patch) | |
| tree | 9acff5da3ff7a09f5b6f1e33ee9ac225471b4da6 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 8c6cdff3cc48101711d0f09852866311780d97db (diff) | |
| parent | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff) | |
| download | pleroma-1a858134edabfe9a85e07fb801b9ed41649ba08a.tar.gz | |
Merge branch 'develop' into issue/1218
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 ee14cfd6b..192984242 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -57,6 +57,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do "mastodon_api_streaming", "polls", "pleroma_explicit_addressing", + "shareable_emoji_packs", if Config.get([:media_proxy, :enabled]) do "media_proxy" end, |