diff options
author | Richard van der Hoff <richard@matrix.org> | 2021-02-26 14:05:40 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2021-02-26 14:05:40 +0000 |
commit | fdbccc1e74c56da19bffc33bfe4f9f8d2b2d26f8 (patch) | |
tree | 4e2e1bdc58f6f77d7856e56261ace9b0218bb9f6 /docker/conf/homeserver.yaml | |
parent | Revert "Redirect redirect requests if they arrive on the wrong URI" (diff) | |
parent | SSO: redirect to public URL before setting cookies (#9436) (diff) | |
download | synapse-fdbccc1e74c56da19bffc33bfe4f9f8d2b2d26f8.tar.xz |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'docker/conf/homeserver.yaml')
-rw-r--r-- | docker/conf/homeserver.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml index 2ed570a5d1..0dea62a87d 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml @@ -89,7 +89,6 @@ federation_rc_concurrent: 3 ## Files ## media_store_path: "/data/media" -uploads_path: "/data/uploads" max_upload_size: "{{ SYNAPSE_MAX_UPLOAD_SIZE or "50M" }}" max_image_pixels: "32M" dynamic_thumbnails: false |