diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 17:10:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 17:10:22 +0000 |
| commit | 54fdbc7e50dfdd80eda563536d08bdfef079937c (patch) | |
| tree | 9d28877f14b914af743629010be54a01477ffddc /synapse/rest/client/v1/room.py | |
| parent | Allow newer versions of syutil (diff) | |
| parent | Bump syutil version (diff) | |
| download | synapse-54fdbc7e50dfdd80eda563536d08bdfef079937c.tar.xz | |
Merge pull request #66 from matrix-org/use-simplejson
Use simplejson
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 410f19ccf6..0346afb1b4 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -23,7 +23,7 @@ from synapse.api.constants import EventTypes, Membership from synapse.types import UserID, RoomID, RoomAlias from synapse.events.utils import serialize_event -import json +import simplejson as json import logging import urllib |