Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions

2020-03-24 20:32:49 +01:00 · 2020-03-24 20:32:49 +01:00 · 212c31c637
commit 212c31c637
parent 64165d1df9 8eebc75c15
119 changed files with 1458 additions and 485 deletions
--- 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,