diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-09-24 13:00:48 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-09-24 13:00:48 +0300 |
| commit | 5e9759cd7d0730c14bcc44e9b3dbda94947d602f (patch) | |
| tree | 5917d89cad99d14a246e33f3e8ebd56e70abe20b /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 79c3443b609663ab23a4353ebdb7e5e2f0e6a150 (diff) | |
| parent | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff) | |
| download | pleroma-5e9759cd7d0730c14bcc44e9b3dbda94947d602f.tar.gz | |
Merge branch 'develop' into feature/return-link-for-password-reset
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, |