diff options
author | Erik Johnston <erik@matrix.org> | 2019-03-21 12:41:42 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-03-21 12:41:42 +0000 |
commit | 0f0671e5e08b79364e88b8abbfaf77a304a277a4 (patch) | |
tree | 9188b8d2574889cdd6bd3a324dc8cbc44983fa16 /synapse/replication/tcp/commands.py | |
parent | Merge pull request #4875 from matrix-org/erikj/spam_checker (diff) | |
parent | Merge pull request #4904 from matrix-org/erikj/fix_shutdown (diff) | |
download | synapse-0f0671e5e08b79364e88b8abbfaf77a304a277a4.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-merged
Diffstat (limited to 'synapse/replication/tcp/commands.py')
-rw-r--r-- | synapse/replication/tcp/commands.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/replication/tcp/commands.py b/synapse/replication/tcp/commands.py |