Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-08-08 20:12:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/release-v1.31.0'

Browse source
This commit is contained in:
Tulir Asokan 2021-03-30 14:03:23 +03:00
commit 7def4428cf
172 changed files with 2588 additions and 787 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/http/client.py
View file

@ -77,7 +77,7 @@ from synapse.util import json_decoder
from synapse.util.async_helpers import timeout_deferred
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)