diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-11 17:41:29 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-11 17:41:29 +0100 |
commit | a23a760b3f5c9b61bc0602250725204c25d7f915 (patch) | |
tree | 0df602fafc24270679f29df1a6259818a1370430 | |
parent | Add missing space because linter (diff) | |
parent | Remove call to recently removed function in mock (diff) | |
download | synapse-a23a760b3f5c9b61bc0602250725204c25d7f915.tar.xz |
Merge branch 'develop' into auth
-rw-r--r-- | tests/test_distributor.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_distributor.py b/tests/test_distributor.py |