summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-08 21:25:26 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-08 21:25:26 +0300
commit95e6a2acd9b18356e942172aa416d42031e8a17f (patch)
treed5093f04fc555435f022c9b3b1f7ce6e945f0199 /config
parent3fe7a1fd35a9ca81b158eff6dbcc25ca48cbf96d (diff)
parentaf5fef1f228a1781d7d9cad490d3b3a783389f5e (diff)
downloadpleroma-95e6a2acd9b18356e942172aa416d42031e8a17f.tar.gz
pleroma-95e6a2acd9b18356e942172aa416d42031e8a17f.zip
Merge branch 'develop' into issue/1342
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,