diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-27 15:41:40 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-27 15:41:40 +0300 |
| commit | 20e0f3660541f19cf878b789aa9f5b9d5ce8cddb (patch) | |
| tree | 08cb90d62e431beb7ee6a2261dc679b725aec1f1 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 2a95014b9d7142aa2549e70f428293af78fae8eb (diff) | |
| parent | 15aa94f40f73444d67da7cb71ec219b97ec5142e (diff) | |
| download | pleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 8c775ce24..216a962bd 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -124,6 +124,9 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do end, if Keyword.get(instance, :allow_relay) do "relay" + end, + if Keyword.get(instance, :safe_dm_mentions) do + "safe_dm_mentions" end ] |> Enum.filter(& &1) |