diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-07 14:34:00 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-07 14:34:00 +0000 |
| commit | bacaa215eb2e1c11e50bbc3fb0e43e28a463458b (patch) | |
| tree | 27510a6358b8bc219ccd456622b963a3b394bee3 /synapse/config/repository.py | |
| parent | Merge branch 'hotfixes-v0.6.0a' (diff) | |
| parent | Improve change log (diff) | |
| download | synapse-bacaa215eb2e1c11e50bbc3fb0e43e28a463458b.tar.xz | |
Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse v0.6.1
Diffstat (limited to 'synapse/config/repository.py')
| -rw-r--r-- | synapse/config/repository.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py index f1b7b1b74e..e1827f05e4 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 matrix.org +# Copyright 2014, 2015 matrix.org # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ class ContentRepositoryConfig(Config): super(ContentRepositoryConfig, cls).add_arguments(parser) db_group = parser.add_argument_group("content_repository") db_group.add_argument( - "--max-upload-size", default="1M" + "--max-upload-size", default="10M" ) db_group.add_argument( "--media-store-path", default=cls.default_path("media_store") |