hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'safe-mentions' into 'develop'

Browse source 
Add safe dm mode option.

See merge request pleroma/pleroma!958
This commit is contained in:
kaniini 2019-03-22 00:50:24 +00:00
commit 1c3d3d0c2b
9 changed files with 102 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/config.exs
View file

@ -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