diff options
| author | lain <lain@soykaf.club> | 2019-09-30 13:57:54 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-09-30 13:57:54 +0200 |
| commit | b923842e96e821afeb7bbfa0d098b9c5698281c5 (patch) | |
| tree | 37d84255d7b97fc411f5c78378565a8f205a2120 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 6fe2f554c36be1ef03ac1d1104a78d0686f48a26 (diff) | |
| parent | 74d8fadf3745a4b4203c2cead35b741554ccc439 (diff) | |
| download | pleroma-b923842e96e821afeb7bbfa0d098b9c5698281c5.tar.gz | |
Merge remote-tracking branch 'origin/develop' into reactions
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, |