diff options
author | David Robertson <davidr@element.io> | 2023-05-30 16:08:33 +0100 |
---|---|---|
committer | David Robertson <davidr@element.io> | 2023-05-30 16:08:33 +0100 |
commit | 6fc3deb0295fda1066c5cd5ecbddbb9ce1cf048c (patch) | |
tree | e81e88f955ac9275257d03cc3cb967ed889d0bd0 /changelog.d/15678.misc | |
parent | Enforce that an admin token also has the basic Matrix API scope (diff) | |
parent | fixup changelog (diff) | |
download | synapse-6fc3deb0295fda1066c5cd5ecbddbb9ce1cf048c.tar.xz |
Merge branch 'release-v1.85' into develop
Diffstat (limited to 'changelog.d/15678.misc')
-rw-r--r-- | changelog.d/15678.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/15678.misc b/changelog.d/15678.misc deleted file mode 100644 index 92eae49952..0000000000 --- a/changelog.d/15678.misc +++ /dev/null @@ -1 +0,0 @@ -Implement "option 2" for [MSC3820](https://github.com/matrix-org/matrix-spec-proposals/pull/3820): Room version 11. \ No newline at end of file |