projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
nodeinfo
/
nodeinfo_controller.ex
diff --git
a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 58009b2792f541803e4b616e554c1143b301d987..e4396da319c3ba3d1c938a6b0b164b5efe69302d 100644
(file)
--- a/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@
-79,7
+79,8
@@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
end,
if Config.get([:instance, :safe_dm_mentions]) do
"safe_dm_mentions"
- end
+ end,
+ "pleroma_emoji_reactions"
]
|> Enum.filter(& &1)