Merge remote-tracking branch 'origin/release-v1.15.1' into bbz/info-mainline-1.15

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py

index f2ccd5e7c6..9815bb8667 100644
--- a/synapse/util/frozenutils.py
+++ b/synapse/util/frozenutils.py
@@ -65,5 +65,5 @@ def _handle_frozendict(obj):
     )
 
 
-# A JSONEncoder which is capable of encoding frozendics without barfing
+# A JSONEncoder which is capable of encoding frozendicts without barfing
 frozendict_json_encoder = json.JSONEncoder(default=_handle_frozendict)