diff options
| author | lain <lain@soykaf.club> | 2020-04-06 12:51:35 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-06 12:51:35 +0000 |
| commit | 1d4ab06505ec5143dbb1d78d718fa9efd1497751 (patch) | |
| tree | 6f8f2758192fb9b9dfba7a34a13ca63185f93bd3 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 96ee0aadbf7f69d86b5f9feb679bcf234f23ca3d (diff) | |
| parent | 7af0959a07ebd5f8242704658ccb770d86fdb4c6 (diff) | |
| download | pleroma-1d4ab06505ec5143dbb1d78d718fa9efd1497751.tar.gz | |
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
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) |