diff options
| author | kPherox <admin@mail.kr-kp.com> | 2019-10-01 01:39:22 +0900 |
|---|---|---|
| committer | kPherox <admin@mail.kr-kp.com> | 2019-10-01 01:40:33 +0900 |
| commit | a0f101ee806af06bcd4271cd8d57d11ff85ea11a (patch) | |
| tree | 2cd3c5d1a645be1395c57ec5616f31afb4b68da7 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 8ca4f145a51e92c9f3a6c374ceddfac22ea300d9 (diff) | |
| parent | 7c9b023a918c84b60ae6547289a083c671a3659b (diff) | |
| download | pleroma-a0f101ee806af06bcd4271cd8d57d11ff85ea11a.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
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, |