diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-01-07 15:07:19 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-01-07 15:07:19 +0000 |
| commit | 4be582d7c85b45d14d0320330b98c9251b3a95ed (patch) | |
| tree | 8d09864ce61b48fe5c4e44a6016713f239d667da /docs/sample_config.yaml | |
| parent | Apply suggestions from code review (diff) | |
| parent | Fixup changelog (diff) | |
| download | synapse-4be582d7c85b45d14d0320330b98c9251b3a95ed.tar.xz | |
Merge branch 'develop' into babolivier/retention_doc
Diffstat (limited to 'docs/sample_config.yaml')
| -rw-r--r-- | docs/sample_config.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index e3b05423b8..fad5f968b5 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -692,10 +692,6 @@ media_store_path: "DATADIR/media_store" # config: # directory: /mnt/some/other/directory -# Directory where in-progress uploads are stored. -# -uploads_path: "DATADIR/uploads" - # The largest allowed upload size in bytes # #max_upload_size: 10M |