diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-06-21 14:01:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-21 14:01:01 +0100 |
| commit | 0fe0b0eeb6e2a1b9b5ca8e453769cfe96b6d84cb (patch) | |
| tree | 7c9246d6764455c5e0abba0f36e614a33f775a7e /synapse/app/homeserver.py | |
| parent | Merge pull request #887 from matrix-org/dbkr/notif_template_subs_fail (diff) | |
| parent | Remove the legacy v0 content upload API. (diff) | |
| download | synapse-0fe0b0eeb6e2a1b9b5ca8e453769cfe96b6d84cb.tar.xz | |
Merge pull request #888 from matrix-org/markjh/content_repo
Remove the legacy v0 content upload API.
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 40ffd9bf0d..9c2dd32953 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -147,7 +147,7 @@ class SynapseHomeServer(HomeServer): MEDIA_PREFIX: media_repo, LEGACY_MEDIA_PREFIX: media_repo, CONTENT_REPO_PREFIX: ContentRepoResource( - self, self.config.uploads_path, self.auth, self.content_addr + self, self.config.uploads_path ), }) @@ -301,7 +301,6 @@ def setup(config_options): db_config=config.database_config, tls_server_context_factory=tls_server_context_factory, config=config, - content_addr=config.content_addr, version_string=version_string, database_engine=database_engine, ) |