summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-15 23:38:43 +0000
committerErik Johnston <erik@matrix.org>2018-03-15 23:38:43 +0000
commit6affde172cfeb89b6307a065ff960214156a9373 (patch)
tree69ce22863cdf788689a4bb6c1a869ff4010f2b33 /synapse/rest/client
parentFix log message in purge_history (diff)
downloadsynapse-github/erikj/fix_things.tar.xz
Replace some ujson with simplejson to make it work github/erikj/fix_things erikj/fix_things
Diffstat (limited to 'synapse/rest/client')
-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__)