diff options
author | Erik Johnston <erik@matrix.org> | 2017-03-21 13:11:19 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-03-21 13:11:19 +0000 |
commit | c042bcbe0fbafafd4553d56eddd12ec2dd9cb976 (patch) | |
tree | ce0fa5f9c96666672f5f524185e53de9daed0d25 /tests/replication/test_resource.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #2033 from matrix-org/erikj/repl_speed (diff) | |
download | synapse-c042bcbe0fbafafd4553d56eddd12ec2dd9cb976.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/replication/test_resource.py')
-rw-r--r-- | tests/replication/test_resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/replication/test_resource.py b/tests/replication/test_resource.py |