diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
| commit | dc4814f0cdc12a552001e5e22c979060e4f3f865 (patch) | |
| tree | 38f8cb1729338768da447a27ae243c27d301c7bd /config/config.exs | |
| parent | 2de41770d04cf07ed8775a307b6d457a4750e265 (diff) | |
| parent | 0c56f9de0d607b88fd107e0bd13ef286f0629346 (diff) | |
| download | pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.tar.gz pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.zip | |
Fix merge conflicts with upstream
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 07565c557..c00d5dca9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -41,7 +41,7 @@ # # This configuration file is loaded before any dependency and # is restricted to this project. -use Mix.Config +import Config # General application configuration config :pleroma, ecto_repos: [Pleroma.Repo] @@ -190,7 +190,6 @@ config :pleroma, :instance, 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, @@ -454,7 +453,9 @@ 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 |