diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-29 15:53:17 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-29 15:53:17 +0000 |
commit | 38474707b99b2425a085a3d96eb5f0d1c4622568 (patch) | |
tree | 0616acc724adf124d1220b9307d5518d5169d803 /synapse/streams | |
parent | Newsfile (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation... (diff) | |
download | synapse-38474707b99b2425a085a3d96eb5f0d1c4622568.tar.xz |
Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/synapse into erikj/receipts_async_await
Diffstat (limited to 'synapse/streams')
0 files changed, 0 insertions, 0 deletions