hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints

Browse source
This commit is contained in:
lain 2018-03-22 12:48:56 +01:00
commit b72a25f5b1
10 changed files with 132 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/router.ex
View file

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