summary refs log tree commit diff
path: root/synapse/storage/events.py
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/storage/events.py
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/storage/events.py')
-rw-r--r--synapse/storage/events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index bbb6aa992c..25300c87be 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -37,7 +37,7 @@ from functools import wraps
 import synapse.metrics
 
 import logging
-import ujson as json
+import simplejson as json
 
 # these are only included to make the type annotations work
 from synapse.events import EventBase    # noqa: F401