diff options
author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-24 20:32:49 +0100 |
---|---|---|
committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-24 20:32:49 +0100 |
commit | 212c31c63796a21233e8decf7ce46853383286fd (patch) | |
tree | 0cc01fbf91ddb5037d67b39f0af80737aeec51ad /lib/pleroma/web/nodeinfo | |
parent | 64165d1df95bc3a22260dafa4584471427685864 (diff) | |
parent | 8eebc75c152ee339bac347350266e3bc6536016b (diff) | |
download | pleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz |
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
Diffstat (limited to 'lib/pleroma/web/nodeinfo')
-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 c653a80c3..f9a5ddcc0 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -60,6 +60,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do "pleroma_explicit_addressing", "shareable_emoji_packs", "multifetch", + "pleroma:api/v1/notifications:include_types_filter", if Config.get([:media_proxy, :enabled]) do "media_proxy" end, |