diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-13 07:18:03 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-13 07:18:03 +0000 |
| commit | ea42ba603fd0d3acd744f9f0b8ffb402e3ff1b2c (patch) | |
| tree | 760b1c2552401e49578b2fe212af9c47508b9410 /lib | |
| parent | c02d03a4c29e252d7f6076ade5bfc0bf4fb8a4c2 (diff) | |
| parent | 3d402a9e2070c38c578d3bc64aed2b9361a4bcf0 (diff) | |
| download | pleroma-ea42ba603fd0d3acd744f9f0b8ffb402e3ff1b2c.tar.gz | |
Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'
webfinger: send JRD by default instead of XRD
See merge request pleroma/pleroma!211
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 ee6a373d3..0e6369147 100644 --- 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 |