summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-02 13:53:30 +0000
committerErik Johnston <erik@matrix.org>2015-03-02 13:53:30 +0000
commit0a036944bd2f0b42195b1984ff0ad2b6ff3d50f3 (patch)
tree25ca81b14a72192a89c9399b3d80180ac124ca14 /synapse/server.py
parentMust update pending_transactions map before yield'ing (diff)
parentMerge pull request #83 from matrix-org/nofile_limit_config (diff)
downloadsynapse-0a036944bd2f0b42195b1984ff0ad2b6ff3d50f3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
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 ba2b2593f1..cb8610a1b4 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -73,6 +73,7 @@ class BaseHomeServer(object):
         'resource_for_client',
         'resource_for_client_v2_alpha',
         'resource_for_federation',
+        'resource_for_static_content',
         'resource_for_web_client',
         'resource_for_content_repo',
         'resource_for_server_key',