diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-22 00:50:24 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-22 00:50:24 +0000 |
| commit | 1c3d3d0c2b6ebb4948df0b4ec085bcc4a564a126 (patch) | |
| tree | da2492e2a4d7e1202e82bff3fbe4d89ddd8b85c5 /config/config.exs | |
| parent | b548181b52c4397d5034cfd95b2ef7e05c9c9c22 (diff) | |
| parent | bf27190f7f0942a05de518f2085a299eb011614c (diff) | |
| download | pleroma-1c3d3d0c2b6ebb4948df0b4ec085bcc4a564a126.tar.gz pleroma-1c3d3d0c2b6ebb4948df0b4ec085bcc4a564a126.zip | |
Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.
See merge request pleroma/pleroma!958
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index c20802faf..bd8922b77 100644 --- a/config/config.exs +++ b/config/config.exs @@ -172,7 +172,8 @@ config :pleroma, :instance, no_attachment_links: false, welcome_user_nickname: nil, welcome_message: nil, - max_report_comment_size: 1000 + max_report_comment_size: 1000, + safe_dm_mentions: false config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because |