projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index d333c618ecb28c6b7604ac9bbe86c80c87859417..2f8a18788cfc0329a01b49951bb304380a9982bb 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-190,7
+190,6
@@
config :pleroma, :instance,
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
description_limit: 5_000,
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
description_limit: 5_000,
- chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
@@
-457,7
+456,9
@@
config :pleroma, :media_preview_proxy,
image_quality: 85,
min_content_length: 100 * 1024
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