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

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

View file

@ -36,7 +36,7 @@ from synapse.storage.purge_events import PurgeEventsStorage
from synapse.storage.state import StateGroupStorage
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
__all__ = ["Databases", "DataStore"]