diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:18:57 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:18:57 +0400 |
| commit | cf2a0574e77ed207453215ae83377a3eb8f2fa0c (patch) | |
| tree | fdc89909325238b71c8fc07a63d8720e432434c4 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 4a2538967caf5b0f9970cc5f973c16ea5d776aa3 (diff) | |
| parent | ce089615e1e89fbb63b0c0548906f3b6c22abac2 (diff) | |
| download | pleroma-cf2a0574e77ed207453215ae83377a3eb8f2fa0c.tar.gz | |
Merge branch 'develop' into fix/support-conversations-pagination
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 30838b1eb..f9a5ddcc0 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -75,7 +75,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) |