diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-10 07:09:28 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-10 07:09:28 +0300 |
| commit | 648cc699e551324a067cd1b906df5f497ade5861 (patch) | |
| tree | 3ddcee32eb0b61770709422aaa266167a8254e28 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 591f7015d91b383dae1ee29576d13c0fad65cad6 (diff) | |
| parent | c433ed9dbb1db9777f235527e06c9c8bec3b1436 (diff) | |
| download | pleroma-648cc699e551324a067cd1b906df5f497ade5861.tar.gz | |
Merge branch 'develop' into support/update_oban
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) |