diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-07 14:09:43 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-07 14:09:43 +0300 |
| commit | 2b7d7bbd2dc3121488592a958c29ba6a418e0104 (patch) | |
| tree | d4d963f9cc8afeae63a7666acab78eae8a8a8c43 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | dbcfac11b45b367185a3b18a2db3e3fb07e8f20d (diff) | |
| parent | 1d4ab06505ec5143dbb1d78d718fa9efd1497751 (diff) | |
| download | pleroma-2b7d7bbd2dc3121488592a958c29ba6a418e0104.tar.gz | |
Merge branch 'develop' into issue/1276
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) |