diff options
author | Erik Johnston <erik@matrix.org> | 2018-06-29 14:10:29 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-06-29 14:10:29 +0100 |
commit | 6a952706719b9fe63bdc7f23cb244e40cef82396 (patch) | |
tree | 2b4fef8bcefe1bae97bddfc85b9eaaa9571443f5 /tests/unittest.py | |
parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
parent | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking (diff) | |
download | synapse-6a952706719b9fe63bdc7f23cb244e40cef82396.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/unittest.py')
-rw-r--r-- | tests/unittest.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/unittest.py b/tests/unittest.py |