summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/sync.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-15 23:38:43 +0000
committerRichard van der Hoff <richard@matrix.org>2018-03-16 00:27:09 +0000
commita8ce159be43560e9aea8f3be65110eea49d1f50e (patch)
treef0efe7d92e993db0ac02cfb0e10d91329456bbab /synapse/rest/client/v2_alpha/sync.py
parentMerge pull request #3003 from matrix-org/rav/fix_contributing (diff)
downloadsynapse-a8ce159be43560e9aea8f3be65110eea49d1f50e.tar.xz
Replace some ujson with simplejson to make it work
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index a0a8e4b8e4..eb91c0b293 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -33,7 +33,7 @@ from ._base import set_timeline_upper_limit
 import itertools
 import logging
 
-import ujson as json
+import simplejson as json
 
 logger = logging.getLogger(__name__)