summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-15 23:38:43 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-03-16 00:55:44 +0000
commitbf49d2dca8db6d82f09441a35cd3655c746b6b4d (patch)
treeff8c9a6666ec5810aa42ce08f2e2535809288079 /synapse/rest
parentmake incr syncs work (diff)
downloadsynapse-bf49d2dca8db6d82f09441a35cd3655c746b6b4d.tar.xz
Replace some ujson with simplejson to make it work
Diffstat (limited to 'synapse/rest')
-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__)