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

diff --cc config/config.exs
index abedd2fbedf1e34ec9580f84a7e6e8e6285f59a2,2f8a18788cfc0329a01b49951bb304380a9982bb..b50c910b12b985ed1c8f6311fc6b8a25c6f8c550
--- 1/config/config.exs
--- 2/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