diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-12 12:37:09 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-12 12:37:09 +0100 |
| commit | 7fe42cf9492273c68a4fede9c697c0c2fb6d020b (patch) | |
| tree | 44d1b5bd52c26dfb9e8e0389b6bebe0e2d861ed3 /synapse/handlers/typing.py | |
| parent | Make reindex happen in bg (diff) | |
| parent | Merge pull request #1103 from matrix-org/markjh/comment_on_create_index (diff) | |
| download | synapse-7fe42cf9492273c68a4fede9c697c0c2fb6d020b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_notif_highlight_query_fast
Diffstat (limited to 'synapse/handlers/typing.py')
| -rw-r--r-- | synapse/handlers/typing.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py index 3b687957dd..0548b81c34 100644 --- a/synapse/handlers/typing.py +++ b/synapse/handlers/typing.py @@ -187,6 +187,7 @@ class TypingHandler(object): "user_id": user_id, "typing": typing, }, + key=(room_id, user_id), )) yield preserve_context_over_deferred( |