diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-09 15:01:26 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-09 15:01:26 +0000 |
commit | 76c5a5c2f67bc24af553e78f83a85ef7d1906921 (patch) | |
tree | 42de17e8d55a5aa48ff3b43462f54569a221010e /synapse/rest | |
parent | Fix server default rule injection (downwards, not upwards!) (diff) | |
parent | Fix typo (diff) | |
download | synapse-76c5a5c2f67bc24af553e78f83a85ef7d1906921.tar.xz |
Merge pull request #55 from matrix-org/profiling
Profiling
Diffstat (limited to 'synapse/rest')
-rw-r--r-- | synapse/rest/client/v1/__init__.py | 2 | ||||
-rw-r--r-- | synapse/rest/client/v2_alpha/__init__.py | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/synapse/rest/client/v2_alpha/__init__.py b/synapse/rest/client/v2_alpha/__init__.py index 8f611de3a8..bca65f2a6a 100644 --- a/synapse/rest/client/v2_alpha/__init__.py +++ b/synapse/rest/client/v2_alpha/__init__.py @@ -25,7 +25,7 @@ class ClientV2AlphaRestResource(JsonResource): """A resource for version 2 alpha of the matrix client API.""" def __init__(self, hs): - JsonResource.__init__(self) + JsonResource.__init__(self, hs) self.register_servlets(self, hs) @staticmethod |