Merge branch 'develop' into feature/custom-runtime-modules

This commit is contained in:
Egor Kislitsyn 2019-12-10 00:16:43 +07:00
commit c098dec473
83 changed files with 2086 additions and 831 deletions

View file

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