Merge 'release-v1.136' into 'master'
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
# [This file includes modifications made by New Vector Limited]
|
||||
#
|
||||
#
|
||||
from twisted.test.proto_helpers import MemoryReactor
|
||||
from twisted.internet.testing import MemoryReactor
|
||||
|
||||
from synapse.api.errors import SynapseError
|
||||
from synapse.rest import admin
|
||||
|
||||
@@ -22,7 +22,7 @@ from typing import Any, Dict, Optional
|
||||
from unittest.mock import AsyncMock, Mock
|
||||
|
||||
from twisted.internet import defer
|
||||
from twisted.test.proto_helpers import MemoryReactor
|
||||
from twisted.internet.testing import MemoryReactor
|
||||
|
||||
from synapse.api.constants import EduTypes, EventTypes
|
||||
from synapse.api.errors import NotFoundError
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
# [This file includes modifications made by New Vector Limited]
|
||||
#
|
||||
#
|
||||
from twisted.test.proto_helpers import MemoryReactor
|
||||
from twisted.internet.testing import MemoryReactor
|
||||
|
||||
from synapse.events import EventBase
|
||||
from synapse.rest import admin, login, room
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#
|
||||
from typing import Literal, Union
|
||||
|
||||
from twisted.test.proto_helpers import MemoryReactor
|
||||
from twisted.internet.testing import MemoryReactor
|
||||
|
||||
from synapse.config.server import DEFAULT_ROOM_VERSION
|
||||
from synapse.rest import admin, login, room, room_upgrade_rest_servlet
|
||||
|
||||
Reference in New Issue
Block a user