diff options
author | Erik Johnston <erik@matrix.org> | 2018-07-23 16:45:22 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-07-23 16:45:22 +0100 |
commit | e1eb147f2aed1e2f3d77f2f37882ddd925aa9c70 (patch) | |
tree | be294ba59c868492f82139479d48eb88c4caba94 /synapse/handlers/message.py | |
parent | Fixup limiter (diff) | |
parent | Merge pull request #3582 from matrix-org/erikj/fixup_stateless (diff) | |
download | synapse-e1eb147f2aed1e2f3d77f2f37882ddd925aa9c70.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r-- | synapse/handlers/message.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py |