diff options
author | feld <feld@feld.me> | 2024-09-06 16:30:07 +0000 |
---|---|---|
committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2024-11-26 14:03:18 +0100 |
commit | 2977779e94cb34610d0c2369ecacf7d721ebc5ab (patch) | |
tree | d1e30c7375c05609850a873fa3a7d5814de2f8fc /lib | |
parent | ced6b10c70769e39ee7d3b6a3fe63b8c2aea3ec0 (diff) | |
download | pleroma-2977779e94cb34610d0c2369ecacf7d721ebc5ab.tar.gz pleroma-2977779e94cb34610d0c2369ecacf7d721ebc5ab.zip |
Merge branch 'well-known' into 'develop'
NodeInfo: Accept application/activity+json requests
See merge request pleroma/pleroma!4242
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/router.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index fc40a1143..4294dffa5 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -189,7 +189,7 @@ defmodule Pleroma.Web.Router do end pipeline :well_known do - plug(:accepts, ["json", "jrd", "jrd+json", "xml", "xrd+xml"]) + plug(:accepts, ["activity+json", "json", "jrd", "jrd+json", "xml", "xrd+xml"]) end pipeline :config do |