diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-12 08:04:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 08:04:15 +0100 |
| commit | 555460ae1b096675a56f2df60fbfe48f166cb82e (patch) | |
| tree | 1f3cbc9fb4c03dcc8bc5183761190b9d768e6cd7 /synapse/handlers/typing.py | |
| parent | Merge pull request #1100 from VShell/fix-cas (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edus (diff) | |
| download | synapse-555460ae1b096675a56f2df60fbfe48f166cb82e.tar.xz | |
Merge pull request #1095 from matrix-org/erikj/batch_edus
Clobber EDUs in send queue
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( |