From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 27 Jul 2021 13:29:53 +0000 (-0500)
Subject: Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=33a19c002a9196cb67d3379d5237f9490c957f1b;p=akkoma

Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
---

33a19c002a9196cb67d3379d5237f9490c957f1b
diff --cc config/config.exs
index abedd2fbe,2f8a18788..b50c910b1
--- a/config/config.exs
+++ b/config/config.exs
@@@ -450,9 -456,11 +456,11 @@@ config :pleroma, :media_preview_proxy
    image_quality: 85,
    min_content_length: 100 * 1024
  
- config :pleroma, :chat, enabled: true
+ config :pleroma, :shout,
+   enabled: true,
+   limit: 5_000
  
 -config :phoenix, :format_encoders, json: Jason
 +config :phoenix, :format_encoders, json: Jason, "activity+json": Jason
  
  config :phoenix, :json_library, Jason