diff options
| author | Eric Eastwood <erice@element.io> | 2021-12-09 02:53:17 -0600 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2021-12-09 02:53:17 -0600 |
| commit | 6b64184585b4935c75e6f4ed44ac17ca48e1f71f (patch) | |
| tree | 048c8b90df46d609514b8bba2c6df5bb809225d2 /synapse/api/urls.py | |
| parent | Merge branch 'develop' into madlittlemods/return-historical-events-in-order-f... (diff) | |
| parent | Add a constant for receipt types (m.read). (#11531) (diff) | |
| download | synapse-6b64184585b4935c75e6f4ed44ac17ca48e1f71f.tar.xz | |
Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill
Conflicts: scripts-dev/complement.sh synapse/handlers/room_batch.py
Diffstat (limited to 'synapse/api/urls.py')
| -rw-r--r-- | synapse/api/urls.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py |