summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-19 11:40:32 +0000
committerErik Johnston <erik@matrix.org>2018-03-19 11:41:01 +0000
commitfa728034900ae63d8132962008319d37df3993db (patch)
tree9ed8d7230c116bc28057f11395a795d3f993880c /synapse/rest/client/v1
parentspell out not to massively increase bcrypt rounds (diff)
parentMerge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-fa728034900ae63d8132962008319d37df3993db.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index f8999d64d7..70d788deea 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -30,7 +30,7 @@ from synapse.http.servlet import (
 
 import logging
 import urllib
-import ujson as json
+import simplejson as json
 
 logger = logging.getLogger(__name__)