Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-06-27 00:20:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

merge develop

Browse source
This commit is contained in:
Matthew Hodgson 2018-05-29 00:25:22 +01:00
commit 7a6df013cc
242 changed files with 7391 additions and 3347 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/api/filtering.py
View file

@ -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