Merge 'release-v1.136' into 'master'

This commit is contained in:
Andrew Morgan
2025-08-12 15:37:55 +01:00
parent 4054d956f7
commit 283ade8e33
402 changed files with 8961 additions and 2567 deletions
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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