diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-22 18:31:01 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-22 18:31:01 +0000 |
| commit | 414902cd9e61d19d4dcd848f60b47beaf23c095f (patch) | |
| tree | c91d3122dc42ea58582fe4d6cd5d7fb5736b22ff /config | |
| parent | 20deff75f153ffbd5076e992c7ed3c19ac551535 (diff) | |
| parent | d35246c4490bcca4831b85d23049c04ffff58758 (diff) | |
| download | pleroma-414902cd9e61d19d4dcd848f60b47beaf23c095f.tar.gz pleroma-414902cd9e61d19d4dcd848f60b47beaf23c095f.zip | |
Merge branch 'add-healthcheck-setting-to-config' into 'develop'
added healthcheck setting to instance config
See merge request pleroma/pleroma!1088
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 9f2244222..b11e4c680 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 |