summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erikj@matrix.org>2023-11-27 11:16:45 +0000
committerGitHub <noreply@github.com>2023-11-27 11:16:45 +0000
commitbe3ec4d78cb8f709b0630f8e21c36b4670a25211 (patch)
treec315b877855ba3489a296daafad36c4d41849209 /tests
parentNewsfile (diff)
parentBump pyasn1 from 0.5.0 to 0.5.1 (#16689) (diff)
downloadsynapse-be3ec4d78cb8f709b0630f8e21c36b4670a25211.tar.xz
Merge branch 'develop' into erikj/py312_asyncio
Diffstat (limited to 'tests')
-rw-r--r--tests/media/test_media_retention.py (renamed from tests/rest/media/test_media_retention.py)0
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/rest/media/test_media_retention.py b/tests/media/test_media_retention.py

index 27a663a23b..27a663a23b 100644 --- a/tests/rest/media/test_media_retention.py +++ b/tests/media/test_media_retention.py