summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-09 15:20:56 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-09 15:20:56 +0000
commit53557fc53259631d71055ef2ab8a6916b00d229b (patch)
tree208db19fb5bbcc5416e669bc496adc49acdcb1a7 /synapse/rest/client/v1
parentFix bugs so lazy room joining works as intended. (diff)
parentMerge pull request #55 from matrix-org/profiling (diff)
downloadsynapse-53557fc53259631d71055ef2ab8a6916b00d229b.tar.xz
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/__init__.py b/synapse/rest/client/v1/__init__.py
index d8d01cdd16..21876b3487 100644
--- a/synapse/rest/client/v1/__init__.py
+++ b/synapse/rest/client/v1/__init__.py
@@ -25,7 +25,7 @@ class ClientV1RestResource(JsonResource):
     """A resource for version 1 of the matrix client API."""
 
     def __init__(self, hs):
-        JsonResource.__init__(self)
+        JsonResource.__init__(self, hs)
         self.register_servlets(self, hs)
 
     @staticmethod