diff options
author | Will Hunt <will@half-shot.uk> | 2018-08-16 01:13:05 +0100 |
---|---|---|
committer | Will Hunt <will@half-shot.uk> | 2018-08-16 01:13:05 +0100 |
commit | b3e005de18d8cc0d871f3f4f4bbfee4d2eca9c24 (patch) | |
tree | f2e43f102010ea827fd94e54c79f3036b53f9539 /tests/test_distributor.py | |
parent | isorted this mess (diff) | |
parent | Merge pull request #3686 from matrix-org/rav/changelog_links_to_prs (diff) | |
download | synapse-b3e005de18d8cc0d871f3f4f4bbfee4d2eca9c24.tar.xz |
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Diffstat (limited to 'tests/test_distributor.py')
-rw-r--r-- | tests/test_distributor.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/test_distributor.py b/tests/test_distributor.py |