summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-18 15:01:08 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-18 17:18:54 +0100
commita18b1a649c5dd7fbb42fa2b1af0530542b8c3873 (patch)
tree1dcce57de58d3510dd5e34edc8117424906268db /synapse/server.py
parentIn members list, on avatar mouseover, show a tooltip with the user matrix id (diff)
downloadsynapse-a18b1a649c5dd7fbb42fa2b1af0530542b8c3873.tar.xz
Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.
Diffstat (limited to '')
-rw-r--r--synapse/server.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 0f7ac352ae..d4c2481483 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -72,6 +72,7 @@ class BaseHomeServer(object):
         'resource_for_client',
         'resource_for_federation',
         'resource_for_web_client',
+        'resource_for_content_repo',
     ]
 
     def __init__(self, hostname, **kwargs):
@@ -140,6 +141,7 @@ class HomeServer(BaseHomeServer):
         resource_for_client
         resource_for_web_client
         resource_for_federation
+        resource_for_content_repo
         http_client
         db_pool
     """