Merge branch 'develop' into rav/saml_config_cleanup

1 files changed, 1 insertions, 1 deletions

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

index f882330293..ca8ae9fb5b 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -319,4 +319,4 @@ class TypingNotificationEventSource(object):
         return self.get_typing_handler()._latest_room_serial
 
     def get_pagination_rows(self, user, pagination_config, key):
-        return ([], pagination_config.from_key)
+        return [], pagination_config.from_key