Merge remote-tracking branch 'origin/develop' into mv/unbind-callback

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py

index 7f1d41eb3c..d24c4f68c4 100644
--- a/synapse/util/async_helpers.py
+++ b/synapse/util/async_helpers.py
@@ -217,7 +217,8 @@ async def concurrently_execute(
         limit: Maximum number of conccurent executions.
 
     Returns:
-        Deferred: Resolved when all function invocations have finished.
+        None, when all function invocations have finished. The return values
+        from those functions are discarded.
     """
     it = iter(args)