summary refs log tree commit diff
path: root/tests/test_mau.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-08-17 14:35:20 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-08-17 14:35:20 +0100
commit18572fddcc5bbcecabdcfbc69c8e8d4a1e9a1a1b (patch)
treedb096f4421fc900d6b98f41e7a1401982cd83171 /tests/test_mau.py
parentHandle string read receipt data (#10606) (diff)
parentRemove the unused public_room_list_stream (#10565) (diff)
downloadsynapse-18572fddcc5bbcecabdcfbc69c8e8d4a1e9a1a1b.tar.xz
Merge branch 'release-v1.41' into matrix-org-hotfixes
Diffstat (limited to 'tests/test_mau.py')
-rw-r--r--tests/test_mau.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_mau.py b/tests/test_mau.py

index fa6ef92b3b..66111eb367 100644 --- a/tests/test_mau.py +++ b/tests/test_mau.py
@@ -17,7 +17,7 @@ from synapse.api.constants import APP_SERVICE_REGISTRATION_TYPE, LoginType from synapse.api.errors import Codes, HttpResponseException, SynapseError from synapse.appservice import ApplicationService -from synapse.rest.client.v2_alpha import register, sync +from synapse.rest.client import register, sync from tests import unittest from tests.unittest import override_config