diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:32:50 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:32:50 +0300 |
| commit | 38245f13367cdc2df29ff2a499418e526b654fb5 (patch) | |
| tree | 514724023f061f56e42fcaa7ae79f07d3d055c58 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | d4ed3a35b8aa34cd968113970bbab445eb251703 (diff) | |
| parent | fd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff) | |
| download | pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.tar.gz | |
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
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, |