diff options
| author | Sachin Joshi <satchin.joshi@gmail.com> | 2019-05-01 00:21:30 +0545 |
|---|---|---|
| committer | Sachin Joshi <satchin.joshi@gmail.com> | 2019-05-01 00:21:30 +0545 |
| commit | cd6da3606b0170b1a5c7d64b96f1621896cc0930 (patch) | |
| tree | 76086dd4145017de644bdeb17a389bb4d8c7a298 /config | |
| parent | 963d5774af7efb57fa306b3ac164049f8958a72c (diff) | |
| parent | 77690b9d03facf74483e3379f72b5b51c9f1bd4e (diff) | |
| download | pleroma-cd6da3606b0170b1a5c7d64b96f1621896cc0930.tar.gz pleroma-cd6da3606b0170b1a5c7d64b96f1621896cc0930.zip | |
Merge branch 'develop' into bugfix/web-notification-special-char
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 9f2244222..1a9738cff 100644 --- a/config/config.exs +++ b/config/config.exs @@ -221,7 +221,8 @@ config :pleroma, :instance, allowed_post_formats: [ "text/plain", "text/html", - "text/markdown" + "text/markdown", + "text/bbcode" ], mrf_transparency: true, autofollowed_nicknames: [], @@ -230,7 +231,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 @@ -325,7 +327,8 @@ config :pleroma, :media_proxy, follow_redirect: true, pool: :media ] - ] + ], + whitelist: [] config :pleroma, :chat, enabled: true |