diff options
| author | Eric Eastwood <erice@element.io> | 2021-12-15 22:38:29 -0600 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2021-12-15 22:38:29 -0600 |
| commit | 1d0004312a3c77869808d7bd30b21c4e5c1572a8 (patch) | |
| tree | 62ebebe9f7809bc0358447268debeed3127587ad /synapse/rest/client/room_batch.py | |
| parent | Merge branch 'develop' into madlittlemods/return-historical-events-in-order-f... (diff) | |
| parent | Add type hints to `synapse/storage/databases/main/room.py` (#11575) (diff) | |
| download | synapse-1d0004312a3c77869808d7bd30b21c4e5c1572a8.tar.xz | |
Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill
Conflicts: synapse/handlers/message.py synapse/handlers/room_member.py
Diffstat (limited to 'synapse/rest/client/room_batch.py')
0 files changed, 0 insertions, 0 deletions