Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-06 11:54:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

Browse source
This commit is contained in:
Erik Johnston 2018-03-19 11:40:32 +00:00
commit fa72803490
27 changed files with 54 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
synapse/storage/events.py
View file

@ -56,7 +56,6 @@ event_counter = metrics.register_counter(
def encode_json(json_object):
if USE_FROZEN_DICTS:
# ujson doesn't like frozen_dicts
return encode_canonical_json(json_object)
else:
return json.dumps(json_object, ensure_ascii=False)