diff options
author | feld <feld@feld.me> | 2024-09-06 16:30:07 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2024-09-06 16:30:07 +0000 |
commit | bb0cb06d8a3a9e97d3b39d712ee5a7147c25ee84 (patch) | |
tree | cf4c295c347ce163e1347f6dd690ade2fdac8885 /lib | |
parent | 80f3e507d4cbddc8f1c0dc28752df0a38a83236e (diff) | |
parent | 4ae17c62944eab89acfa96a0912819093c872436 (diff) | |
download | pleroma-bb0cb06d8a3a9e97d3b39d712ee5a7147c25ee84.tar.gz pleroma-bb0cb06d8a3a9e97d3b39d712ee5a7147c25ee84.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 9b9ee421c..0423ca9e2 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 |