diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-09-26 19:01:54 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-09-26 19:01:54 +0300 |
| commit | e7836adf21421de7a6d1d84fd605ec7d7f207cda (patch) | |
| tree | ca378665486e37ec82a19feb95c84d2131b83e7a /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | df15ed13d15db5b5a371345fcb9968b5af4100af (diff) | |
| parent | 6abe12dceda8d0d32878208987a9631d5d546a3d (diff) | |
| download | pleroma-e7836adf21421de7a6d1d84fd605ec7d7f207cda.tar.gz | |
Merge branch 'develop' into feature/moderation-log-filters
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, |