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
committerRichard van der Hoff <richard@matrix.org>2018-03-16 00:27:09 +0000
commita8ce159be43560e9aea8f3be65110eea49d1f50e (patch)
treef0efe7d92e993db0ac02cfb0e10d91329456bbab /synapse/storage/events.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/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 3890878170..9fc65229fd 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -38,7 +38,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