summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-12-11 18:34:26 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-12-11 18:34:26 +0000
commit57b509454527752c2c4153a43294beb65a38a702 (patch)
tree653fd9ea3b5c339a1ac1abf9f42aeb71d7ad3dd8 /synapse/server.py
parentAvoid cyclic dependency in handler setup (diff)
parentFix typo in media repository doc string (diff)
downloadsynapse-57b509454527752c2c4153a43294beb65a38a702.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py
index da0a44433a..7eb15270fc 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -78,6 +78,7 @@ class BaseHomeServer(object):
         'resource_for_web_client',
         'resource_for_content_repo',
         'resource_for_server_key',
+        'resource_for_media_repository',
         'event_sources',
         'ratelimiter',
         'keyring',