summary refs log tree commit diff
path: root/synapse/storage/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-15 23:43:31 +0000
committerErik Johnston <erik@matrix.org>2018-03-15 23:43:31 +0000
commit926ba76e23ea9d55638baff541cdfaeb9e01ac47 (patch)
tree0fb744087cf47900122e60d5fa4b17765588a6b7 /synapse/storage/room.py
parentMerge pull request #2798 from jeremycline/fedora-repo (diff)
downloadsynapse-926ba76e23ea9d55638baff541cdfaeb9e01ac47.tar.xz
Replace ujson with simplejson
Diffstat (limited to 'synapse/storage/room.py')
-rw-r--r--synapse/storage/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py

index 23688430b7..2051d8506d 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py
@@ -23,7 +23,7 @@ from .engines import PostgresEngine, Sqlite3Engine import collections import logging -import ujson as json +import simplejson as json import re logger = logging.getLogger(__name__)