Merge branch 'release-v1.18.0' into matrix-org-hotfixes

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py

index f3c0aeceb6..506bb2b275 100644
--- a/synapse/handlers/admin.py
+++ b/synapse/handlers/admin.py
@@ -72,7 +72,7 @@ class AdminHandler(BaseHandler):
             writer (ExfiltrationWriter)
 
         Returns:
-            defer.Deferred: Resolves when all data for a user has been written.
+            Resolves when all data for a user has been written.
             The returned value is that returned by `writer.finished()`.
         """
         # Get all rooms the user is in or has been in