diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-04 09:46:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-04 09:46:16 +0100 |
| commit | 62b89daac6f4418d831d531fa40ad71aa0c74fb9 (patch) | |
| tree | a5fa797ac7e65f85cae52cccd88451e5672257c6 /tests/appservice/test_appservice.py | |
| parent | Always advance stream tokens (diff) | |
| parent | Merge pull request #2095 from matrix-org/rav/cull_log_preserves (diff) | |
| download | synapse-62b89daac6f4418d831d531fa40ad71aa0c74fb9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_server
Diffstat (limited to '')
| -rw-r--r-- | tests/appservice/test_appservice.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/appservice/test_appservice.py b/tests/appservice/test_appservice.py |
