diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-09 15:20:56 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-09 15:20:56 +0000 |
| commit | 53557fc53259631d71055ef2ab8a6916b00d229b (patch) | |
| tree | 208db19fb5bbcc5416e669bc496adc49acdcb1a7 /synapse/rest/client | |
| parent | Fix bugs so lazy room joining works as intended. (diff) | |
| parent | Merge pull request #55 from matrix-org/profiling (diff) | |
| download | synapse-53557fc53259631d71055ef2ab8a6916b00d229b.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/rest/client')
| -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 |