Merge f93d2618bf into adeedb7b7c

fix import changed by merge
Merge branch 'develop' into shay/account_suspension_pt_2
2024-06-30 11:23:34 +00:00 · 2024-06-21 21:00:33 +00:00 · 2024-06-21 14:00:16 -07:00 · 2024-06-21 13:59:01 -07:00
2 changed files with 2 additions and 2 deletions
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@ -432,7 +432,7 @@ class ExperimentalConfig(Config):
                "You cannot have MSC4108 both enabled and delegated at the same time",
                ("experimental", "msc4108_delegation_endpoint"),
            )
-        
+
        self.msc3823_account_suspension = experimental.get(
            "msc3823_account_suspension", False
        )
--- a/synapse/rest/admin/users.py
+++ b/synapse/rest/admin/users.py
@ -48,10 +48,10 @@ from synapse.rest.admin._base import (
    assert_user_is_admin,
 )
 from synapse.rest.client._base import client_patterns
-from synapse.rest.models import RequestBodyModel
 from synapse.storage.databases.main.registration import ExternalIDReuseException
 from synapse.storage.databases.main.stats import UserSortOrder
 from synapse.types import JsonDict, JsonMapping, UserID
+from synapse.types.rest import RequestBodyModel

 if TYPE_CHECKING:
    from synapse.server import HomeServer
Author	SHA1	Message	Date
Shay	1dd22d4932	Merge `f93d2618bf` into `adeedb7b7c`	2024-06-21 21:00:33 +00:00
H. Shay	f93d2618bf	fix import changed by merge	2024-06-21 14:00:16 -07:00
H. Shay	2fe7d28a88	Merge branch 'develop' into shay/account_suspension_pt_2	2024-06-21 13:59:01 -07:00