summary refs log tree commit diff
path: root/synapse/rest/client/v1/presence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 17:10:22 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 17:10:22 +0000
commit54fdbc7e50dfdd80eda563536d08bdfef079937c (patch)
tree9d28877f14b914af743629010be54a01477ffddc /synapse/rest/client/v1/presence.py
parentAllow newer versions of syutil (diff)
parentBump syutil version (diff)
downloadsynapse-54fdbc7e50dfdd80eda563536d08bdfef079937c.tar.xz
Merge pull request #66 from matrix-org/use-simplejson
Use simplejson
Diffstat (limited to 'synapse/rest/client/v1/presence.py')
-rw-r--r--synapse/rest/client/v1/presence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py
index 7feb4aadb1..78d4f2b128 100644
--- a/synapse/rest/client/v1/presence.py
+++ b/synapse/rest/client/v1/presence.py
@@ -21,7 +21,7 @@ from synapse.api.errors import SynapseError
 from synapse.types import UserID
 from .base import ClientV1RestServlet, client_path_pattern
 
-import json
+import simplejson as json
 import logging
 
 logger = logging.getLogger(__name__)