summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorkaiyou <pierre@jaury.eu>2018-03-17 16:02:08 +0100
committerkaiyou <pierre@jaury.eu>2018-03-17 16:02:08 +0100
commit757f1b58437f912e147f523ea55d45dfda8a8c1e (patch)
tree034e210d3df7ef63c43ba0d5a35231ba398fedca /synapse/rest/client/v1/room.py
parentDisable logging to file and rely on the console when using Docker (diff)
parentMerge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-757f1b58437f912e147f523ea55d45dfda8a8c1e.tar.xz
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-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 75b735b47d..80989731fa 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -29,7 +29,7 @@ from synapse.http.servlet import ( import logging import urllib -import ujson as json +import simplejson as json logger = logging.getLogger(__name__)