diff options
| author | Erik Johnston <erik@matrix.org> | 2016-07-28 10:37:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-07-28 10:37:43 +0100 |
| commit | 18e044628ed9cd6e034967e283784cf0a284a17d (patch) | |
| tree | 497cc68775bc8d05883ce3eed901cec955dcfb83 /synapse/push/push_tools.py | |
| parent | Bump CHANGES and version (diff) | |
| parent | Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name (diff) | |
| download | synapse-18e044628ed9cd6e034967e283784cf0a284a17d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/push/push_tools.py')
| -rw-r--r-- | synapse/push/push_tools.py | 2 |
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 |