Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfiltrate_data

This commit is contained in:
Erik Johnston 2019-07-05 14:08:21 +01:00
commit 7f0d8e4288
217 changed files with 1732 additions and 1407 deletions

View file

@ -41,12 +41,12 @@ from six.moves import range
from twisted.internet import defer
from synapse.logging.context import make_deferred_yieldable, run_in_background
from synapse.storage._base import SQLBaseStore
from synapse.storage.engines import PostgresEngine
from synapse.storage.events_worker import EventsWorkerStore
from synapse.types import RoomStreamToken
from synapse.util.caches.stream_change_cache import StreamChangeCache
from synapse.util.logcontext import make_deferred_yieldable, run_in_background
logger = logging.getLogger(__name__)