projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into global-status-expiration
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
diff --git
a/lib/pleroma/web/router.ex
b/lib/pleroma/web/router.ex
index e4e3ee704eac2705cfa3d1cdad6baa50455e3e1e..3f36f6c1a8d000b7e3f7de3f554a77dd02a2888d 100644
(file)
--- a/
lib/pleroma/web/router.ex
+++ b/
lib/pleroma/web/router.ex
@@
-513,7
+513,7
@@
defmodule Pleroma.Web.Router do
end
pipeline :ostatus do
end
pipeline :ostatus do
- plug(:accepts, ["html", "xml", "atom", "activity+json", "json"])
+ plug(:accepts, ["html", "xml", "
rss", "
atom", "activity+json", "json"])
plug(Pleroma.Plugs.StaticFEPlug)
end
plug(Pleroma.Plugs.StaticFEPlug)
end