Commit ea42ba60 authored by lain's avatar lain
Browse files

Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'

webfinger: send JRD by default instead of XRD

See merge request pleroma/pleroma!211
parents c02d03a4 3d402a9e
Pipeline #2423 passed with stages
in 4 minutes and 46 seconds
......@@ -41,7 +41,7 @@ def user_fetcher(username) do
pipeline :well_known do
plug(:accepts, ["xml", "xrd+xml", "json", "jrd+json"])
plug(:accepts, ["json", "jrd+json", "xml", "xml+xrd"])
pipeline :config do
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment