diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-13 22:11:16 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-13 22:11:16 +0300 |
| commit | e3508988283a0902a7e330995a0c224811956bce (patch) | |
| tree | edd0a0eb6301980aef5fe02653610929594607cf /config/config.exs | |
| parent | 3e4d84729a4ca8d9779d439a9aa2c8c23b3acd1d (diff) | |
| parent | f917285b72dbc770be40478e1a55973f29d5db7d (diff) | |
| download | pleroma-e3508988283a0902a7e330995a0c224811956bce.tar.gz pleroma-e3508988283a0902a7e330995a0c224811956bce.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs index d6d116314..7b14fbfe5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -63,14 +63,6 @@ config :pleroma, Pleroma.Upload, filters: [Pleroma.Upload.Filter.Dedupe], link_name: false, proxy_remote: false, - proxy_opts: [ - redirect_on_failure: false, - max_body_length: 25 * 1_048_576, - http: [ - follow_redirect: true, - pool: :upload - ] - ], filename_display_max_length: 30, default_description: nil |