diff options
| author | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
| commit | 5aa024e50132924d50229c633249a17eff9180f1 (patch) | |
| tree | 5b0ee152c49f6a772bcb4e133fd4649aa612bda3 /synapse/push/push_tools.py | |
| parent | Add destination retry to slave store (diff) | |
| parent | Merge pull request #966 from matrix-org/markjh/fix_push (diff) | |
| download | synapse-5aa024e50132924d50229c633249a17eff9180f1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
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 |