diff options
author | Ben Banfield-Zanin <benbz@matrix.org> | 2020-06-25 08:33:23 +0100 |
---|---|---|
committer | Ben Banfield-Zanin <benbz@matrix.org> | 2020-06-25 08:33:23 +0100 |
commit | 2e9f389fd2d4cd9acaf9f4a0ac5e3ea358bfc860 (patch) | |
tree | 6f6f2b3d1b0c40c16008fd34e3435881e353bda8 /synapse/util/async_helpers.py | |
parent | Merge remote-tracking branch 'origin/babolivier/info_mainline' into bbz/info-... (diff) | |
parent | Fix changelog wording (diff) | |
download | synapse-2e9f389fd2d4cd9acaf9f4a0ac5e3ea358bfc860.tar.xz |
Merge remote-tracking branch 'origin/release-v1.15.1' into bbz/info-mainline-1.15
Diffstat (limited to 'synapse/util/async_helpers.py')
-rw-r--r-- | synapse/util/async_helpers.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py |