diff options
| author | lain <lain@soykaf.club> | 2019-10-10 14:40:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-10 14:40:59 +0200 |
| commit | c54ae662dcc08c0c04a1dff7bb7a361665e877b8 (patch) | |
| tree | afb9cce0d7bcc15cd2fe3221609d7883d45d0057 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 02f8e2a8ab65c3e8497bab4576ce4e75f8df3217 (diff) | |
| parent | 6355694309b0bad3687a8a7820b81ebf6625751d (diff) | |
| download | pleroma-c54ae662dcc08c0c04a1dff7bb7a361665e877b8.tar.gz | |
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
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, |