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

webfinger: send JRD by default instead of XRD

See merge request pleroma/pleroma!211
This commit is contained in:
lambda 2018-06-13 07:18:03 +00:00
commit ea42ba603f

View File

@ -41,7 +41,7 @@ defmodule Pleroma.Web.Router do
end end
pipeline :well_known do pipeline :well_known do
plug(:accepts, ["xml", "xrd+xml", "json", "jrd+json"]) plug(:accepts, ["json", "jrd+json", "xml", "xml+xrd"])
end end
pipeline :config do pipeline :config do