summary refs log tree commit diff
path: root/synapse/handlers/device.py
diff options
context:
space:
mode:
authorMathieu Velten <matmaul@gmail.com>2023-10-10 16:55:30 +0200
committerMathieu Velten <matmaul@gmail.com>2023-10-10 16:55:30 +0200
commit86641cb3a820e287b8c0a256fd363a2826b51dcb (patch)
tree096ea776661f1d14876b7e7f33553d376ade43bf /synapse/handlers/device.py
parentMerge remote-tracking branch 'origin/develop' into anoa/public_rooms_module_api (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-86641cb3a820e287b8c0a256fd363a2826b51dcb.tar.xz
Merge remote-tracking branch 'origin/develop' into anoa/public_rooms_module_api github/anoa/public_rooms_module_api anoa/public_rooms_module_api
Diffstat (limited to 'synapse/handlers/device.py')
-rw-r--r--synapse/handlers/device.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py

index 86ad96d030..50df4f2b06 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py
@@ -845,7 +845,6 @@ class DeviceHandler(DeviceWorkerHandler): else: assert max_stream_id == stream_id # Avoid moving `room_id` backwards. - pass if self._handle_new_device_update_new_data: continue