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 /changelog.d/11269.misc | |
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 'changelog.d/11269.misc')
-rw-r--r-- | changelog.d/11269.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/11269.misc b/changelog.d/11269.misc deleted file mode 100644 index a2149c2d2d..0000000000 --- a/changelog.d/11269.misc +++ /dev/null @@ -1 +0,0 @@ -Clean up trivial aspects of the Debian package build tooling. |