summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-07-07 03:00:52 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-07-07 03:00:52 +0000
commitd81acb5f6250766eef1dc8c51ed0c79e819ae2af (patch)
treed54e27b8306f5323d434d54639ca38a5f9c874d5 /config
parent2a323d37971d364fefd46e840424c631cc4a7d2b (diff)
parent58da575935f19b86c614717f4fe0d4b8508f395d (diff)
downloadpleroma-d81acb5f6250766eef1dc8c51ed0c79e819ae2af.tar.gz
pleroma-d81acb5f6250766eef1dc8c51ed0c79e819ae2af.zip
Merge branch 'description-limits' into 'develop'
Add limits to image descriptions See merge request pleroma/pleroma!2724
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 9b550920c..d28a359b2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -188,6 +188,7 @@ config :pleroma, :instance,
background_image: "/images/city.jpg",
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
+ description_limit: 5_000,
chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,