Merge branch 'develop' into madlittlemods/optimize-msc2716-v1 github/madlittlemods/optimize-msc2716-v1 madlittlemods/optimize-msc2716-v1

Conflicts:
	synapse/handlers/room_batch.py

1 files changed, 1 insertions, 1 deletions

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

index 0fb919acf6..a42c3558e4 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -649,7 +649,7 @@ class ApplicationServicesHandler:
         """Retrieve a list of application services interested in this event.
 
         Args:
-            event: The event to check. Can be None if alias_list is not.
+            event: The event to check.
         Returns:
             A list of services interested in this event based on the service regex.
         """