Merge remote-tracking branch 'origin/develop' into shhs

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/storage/deviceinbox.py b/synapse/storage/deviceinbox.py

index fed4ea3610..9b0a99cb49 100644
--- a/synapse/storage/deviceinbox.py
+++ b/synapse/storage/deviceinbox.py
@@ -118,7 +118,7 @@ class DeviceInboxWorkerStore(SQLBaseStore):
         defer.returnValue(count)
 
     def get_new_device_msgs_for_remote(
-        self, destination, last_stream_id, current_stream_id, limit=100
+        self, destination, last_stream_id, current_stream_id, limit
     ):
         """
         Args: