summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-07-28 10:04:37 +0100
committerDavid Baker <dave@matrix.org>2016-07-28 10:04:52 +0100
commitecd5e6bfa4b84b6beb47b27d476f0bdba66f7a23 (patch)
tree5122c80da5114496dfff5003ba61ddca600dd844
parentMerge pull request #956 from matrix-org/rav/check_device_id_on_key_upload (diff)
downloadsynapse-ecd5e6bfa4b84b6beb47b27d476f0bdba66f7a23.tar.xz
Typo
-rw-r--r--synapse/push/push_tools.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py
index 6f2d1ad57d..d555a33e9a 100644
--- a/synapse/push/push_tools.py
+++ b/synapse/push/push_tools.py
@@ -54,7 +54,7 @@ def get_context_for_event(state_handler, ev, user_id):
     room_state = yield state_handler.get_current_state(ev.room_id)
 
     # we no longer bother setting room_alias, and make room_name the
-    # human-readable name instead, be that m.room.namer, an alias or
+    # human-readable name instead, be that m.room.name, an alias or
     # a list of people in the room
     name = calculate_room_name(
         room_state, user_id, fallback_to_single_member=False