diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
commit | d05ff3e0985d40f2a5fd6c095178f75aebf53220 (patch) | |
tree | 44c323d736e3e91d7cd38a9f6ea5f54c465f8990 /synapse/federation | |
parent | Created m-file-input. A directive to open a file selection dialog on whatever... (diff) | |
parent | Honour the -w flag to enable the web client at /matrix/client (diff) | |
download | synapse-d05ff3e0985d40f2a5fd6c095178f75aebf53220.tar.xz |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'synapse/federation')
-rw-r--r-- | synapse/federation/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/__init__.py b/synapse/federation/__init__.py index ac0c10dc33..b15e7cf941 100644 --- a/synapse/federation/__init__.py +++ b/synapse/federation/__init__.py @@ -23,7 +23,7 @@ from .transport import TransportLayer def initialize_http_replication(homeserver): transport = TransportLayer( homeserver.hostname, - server=homeserver.get_http_server(), + server=homeserver.get_resource_for_federation(), client=homeserver.get_http_client() ) |