diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-25 13:41:10 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-25 13:41:10 +0700 |
| commit | c157e27a000a12dc8f660c056744a6611beb01b1 (patch) | |
| tree | 36ae4721a1cb92983c7a8fed41b737e0a5a57486 /config | |
| parent | e8c2f9a73a37636a9a8ed5c2998617b841f482da (diff) | |
| parent | 3789945784a331790d73f69b407751df9f7d6e8f (diff) | |
| download | pleroma-c157e27a000a12dc8f660c056744a6611beb01b1.tar.gz pleroma-c157e27a000a12dc8f660c056744a6611beb01b1.zip | |
Merge branch 'develop' into feature/disable-account
Diffstat (limited to 'config')
| -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 9dc9387c8..80f0c3f25 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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 |