summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 14:38:26 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 14:38:26 +0100
commit1996a5f445ce88fa293e13bd3dec31e898c0b220 (patch)
tree22a20413e40a4becce60db04fc4b5cf73ec74c6f /synapse/config
parentMerge commit 'e22b71810' into anoa/dinsic_release_1_31_0 (diff)
parentRemove vestiges of uploads_path config (#9462) (diff)
downloadsynapse-1996a5f445ce88fa293e13bd3dec31e898c0b220.tar.xz
Merge commit '1b2d6d55c' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/repository.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py

index 45f90beabc..8398b3756c 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py
@@ -212,7 +212,6 @@ class ContentRepositoryConfig(Config): def generate_config_section(self, data_dir_path, **kwargs): media_store = os.path.join(data_dir_path, "media_store") - uploads_path = os.path.join(data_dir_path, "uploads") formatted_thumbnail_sizes = "".join( THUMBNAIL_SIZE_YAML % s for s in DEFAULT_THUMBNAIL_SIZES