summary refs log tree commit diff
path: root/synapse/api
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/api
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/api')
-rw-r--r--synapse/api/filtering.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py

index 83206348e5..db43219d24 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py
@@ -17,7 +17,7 @@ from synapse.storage.presence import UserPresenceState from synapse.types import UserID, RoomID from twisted.internet import defer -import ujson as json +import simplejson as json import jsonschema from jsonschema import FormatChecker