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

1 files changed, 0 insertions, 1 deletions

diff --git a/synapse/storage/events.py b/synapse/storage/events.py

index 9fc65229fd..85ce6bea1a 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -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)