summary refs log tree commit diff
path: root/synapse/rest/admin
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-30 11:44:18 +0100
committerGitHub <noreply@github.com>2019-10-30 11:44:18 +0100
commit770d1ef6733cd2560b7bddbc6ec43ea72c95400d (patch)
tree1707085c2d3b3a6e283b6aefb6bc35a4319a541f /synapse/rest/admin
parentMerge pull request #6274 from matrix-org/erikj/replication_async (diff)
parentMerge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s... (diff)
downloadsynapse-770d1ef6733cd2560b7bddbc6ec43ea72c95400d.tar.xz
Merge pull request #6280 from matrix-org/erikj/receipts_async_await
Port receipt and read markers to async/wait
Diffstat (limited to 'synapse/rest/admin')
0 files changed, 0 insertions, 0 deletions