logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: ea42ba603fd0d3acd744f9f0b8ffb402e3ff1b2c
parent: c02d03a4c29e252d7f6076ade5bfc0bf4fb8a4c2
Author: lambda <pleromagit@rogerbraun.net>
Date:   Wed, 13 Jun 2018 07:18:03 +0000

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

webfinger: send JRD by default instead of XRD

See merge request pleroma/pleroma!211

Diffstat:

Mlib/pleroma/web/router.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex @@ -41,7 +41,7 @@ defmodule Pleroma.Web.Router do end pipeline :well_known do - plug(:accepts, ["xml", "xrd+xml", "json", "jrd+json"]) + plug(:accepts, ["json", "jrd+json", "xml", "xml+xrd"]) end pipeline :config do