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

Merge branch 'develop' into feature/disable-account

Browse source
This commit is contained in:
Egor Kislitsyn 2019-04-25 13:41:10 +07:00
commit c157e27a00
58 changed files with 702 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/config.exs
View file

@ -230,7 +230,8 @@ config :pleroma, :instance,
welcome_user_nickname: nil,
welcome_message: nil,
max_report_comment_size: 1000,
safe_dm_mentions: false
safe_dm_mentions: false,
healthcheck: false
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because