diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-06-01 10:56:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-06-01 10:56:05 +0100 |
| commit | b8d49be5a1d8719ec47a44547d043874c8bfaddc (patch) | |
| tree | 52e58244f968f10176f8624eac19452d3337f810 /synapse/rest | |
| parent | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ... (diff) | |
| parent | Merge pull request #172 from intelfx/contrib-systemd (diff) | |
| download | synapse-b8d49be5a1d8719ec47a44547d043874c8bfaddc.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/python_dependencies.py
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 21876b3487..cc9b49d539 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, hs) + JsonResource.__init__(self, hs, canonical_json=False) 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 28d95b2729..7d1aff4307 100644 --- a/synapse/rest/client/v2_alpha/__init__.py +++ b/synapse/rest/client/v2_alpha/__init__.py @@ -28,7 +28,7 @@ class ClientV2AlphaRestResource(JsonResource): """A resource for version 2 alpha of the matrix client API.""" def __init__(self, hs): - JsonResource.__init__(self, hs) + JsonResource.__init__(self, hs, canonical_json=False) self.register_servlets(self, hs) @staticmethod |