diff options
author | Erik Johnston <erik@matrix.org> | 2024-02-06 15:27:17 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2024-02-06 15:27:17 +0000 |
commit | f7a8fafbc1c13c930686f9d8feaaa03a56a67553 (patch) | |
tree | 12132265317205cca849c95283c3284cb016b8e3 /changelog.d | |
parent | Merge branch 'release-v1.100' into matrix-org-hotfixes (diff) | |
parent | Accept unprefixed form of MSC3981 recurse parameter (#16842) (diff) | |
download | synapse-f7a8fafbc1c13c930686f9d8feaaa03a56a67553.tar.xz |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/16842.misc | 1 | ||||
-rw-r--r-- | changelog.d/16853.doc | 1 | ||||
-rw-r--r-- | changelog.d/16854.doc | 1 | ||||
-rw-r--r-- | changelog.d/16880.doc | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/16842.misc b/changelog.d/16842.misc new file mode 100644 |