diff options
author | Matthew Hodgson <matthew@matrix.org> | 2017-01-05 13:03:02 +0000 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2017-01-05 13:03:02 +0000 |
commit | b31ed227388d1ec599399184b127ad09de9735dc (patch) | |
tree | b4d71b9d56c0a611165f1bf6b682d5cdb1a7d04c /synapse/util/async.py | |
parent | Merge pull request #1744 from matrix-org/matthew/timeout_get_missing_events (diff) | |
parent | Merge pull request #1766 from matrix-org/markjh/linear_logging (diff) | |
download | synapse-b31ed227388d1ec599399184b127ad09de9735dc.tar.xz |
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/util/async.py')
-rw-r--r-- | synapse/util/async.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py |