summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-08 19:52:46 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-08 19:52:46 +0300
commit5876a9cb79e53f932d63e457610852031669a222 (patch)
tree6ff7335e9ddd5cfbce1e33ca075265c6f31b8b61 /config
parent3c3bba0b7c65187b3270ef3402442cf870a55198 (diff)
parentaf5fef1f228a1781d7d9cad490d3b3a783389f5e (diff)
downloadpleroma-5876a9cb79e53f932d63e457610852031669a222.tar.gz
pleroma-5876a9cb79e53f932d63e457610852031669a222.zip
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config')
-rw-r--r--config/config.exs1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 259529f97..bca1f78ac 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -211,6 +211,7 @@ config :pleroma, :instance,
notify_email: "noreply@example.com",
description: "A Pleroma instance, an alternative fediverse server",
limit: 5_000,
+ chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,