mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-16 14:30:23 -04:00
Merge remote-tracking branch 'upstream/release-v1.54'
This commit is contained in:
commit
0b2b774c33
361 changed files with 7042 additions and 3821 deletions
|
@ -20,8 +20,8 @@ from urllib.request import getproxies_environment # type: ignore
|
|||
import attr
|
||||
|
||||
from synapse.config.server import DEFAULT_IP_RANGE_BLACKLIST, generate_ip_set
|
||||
from synapse.python_dependencies import DependencyException, check_requirements
|
||||
from synapse.types import JsonDict
|
||||
from synapse.util.check_dependencies import DependencyException, check_requirements
|
||||
from synapse.util.module_loader import load_module
|
||||
|
||||
from ._base import Config, ConfigError
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue