summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-04-25 14:42:59 +0100
committerDavid Baker <dave@matrix.org>2016-04-25 14:42:59 +0100
commit290f125a13c3c9f5cb772909248d4e482dcfb871 (patch)
treead3bdd2605810b2ca10a3ed0b6fbc5f8684df4d7
parentNo we don't: it's just the display name (diff)
downloadsynapse-290f125a13c3c9f5cb772909248d4e482dcfb871.tar.xz
Typo
-rw-r--r--synapse/util/room_name.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/room_name.py b/synapse/util/room_name.py
index d85ccaea55..f55ef293b6 100644
--- a/synapse/util/room_name.py
+++ b/synapse/util/room_name.py
@@ -29,7 +29,7 @@ def calculate_room_name(room_state, user_id):
         if m_room_name.content and m_room_name.content["name"]:
             return m_room_name.content["name"]
 
-    # does it have a caononical alias?
+    # does it have a canonical alias?
     if ("m.room.canonical_alias", "") in room_state:
         canon_alias = room_state[("m.room.canonical_alias", "")]
         if (