Merge branch 'develop' into issue/1383

This commit is contained in:
Maksim Pechnikov 2019-12-08 19:52:46 +03:00
commit 5876a9cb79
55 changed files with 1159 additions and 417 deletions

View file

@ -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,