Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

2018-04-02 13:15:38 +02:00 · 2018-04-02 13:15:38 +02:00 · cd543d58a1
commit cd543d58a1
parent 0a14d155d6 7130e9ddb1
297 changed files with 1548 additions and 139218 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -50,6 +50,7 @@ config :pleroma, :instance,
  name: "Pleroma",
  email: "example@example.com",
  limit: 5000,
+  upload_limit: 16_000_000,
  registrations_open: true,
  federating: true