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:35:05 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-12-11 18:35:05 +0000
commit0b700233737adfa3c6558e988822e7f9ee31ca39 (patch)
treeeac8aff9fb9f58da245c9c3e7a80fa13ac5e1eb1 /synapse/server.py
parentMerge remote-tracking branch 'origin' into typing_notifications (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-0b700233737adfa3c6558e988822e7f9ee31ca39.tar.xz
Merge branch 'develop' into typing_notifications
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',