diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-18 14:15:25 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-18 14:15:25 +0000 |
commit | 915e56e1af598a24b623dda6724cc3ce1e1504e9 (patch) | |
tree | ce7ac77b3714ccaa6d54cb30201ce5cfa2041e63 /tests/federation/test_federation.py | |
parent | adding link to apt repo (diff) | |
parent | Change date (diff) | |
download | synapse-915e56e1af598a24b623dda6724cc3ce1e1504e9.tar.xz |
Merge branch 'hotfixes-v0.11.0-r1' v0.11.0-r1
Diffstat (limited to 'tests/federation/test_federation.py')
-rw-r--r-- | tests/federation/test_federation.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py |