summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-08 20:14:28 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-08 20:14:28 +0300
commit6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9 (patch)
tree6b8e22663fd5b6d5cdf3afaa4b306775d59b503a /config
parent49bb0a130f93476d32d3177d7a989b7a98a063f2 (diff)
parentaf5fef1f228a1781d7d9cad490d3b3a783389f5e (diff)
downloadpleroma-6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9.tar.gz
pleroma-6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9.zip
Merge branch 'develop' into issue/1276
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 b60ffef7d..4624bded2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -225,6 +225,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,