summary refs log tree commit diff
path: root/changelog.d/15681.misc
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-05-30 16:08:33 +0100
committerDavid Robertson <davidr@element.io>2023-05-30 16:08:33 +0100
commit6fc3deb0295fda1066c5cd5ecbddbb9ce1cf048c (patch)
treee81e88f955ac9275257d03cc3cb967ed889d0bd0 /changelog.d/15681.misc
parentEnforce that an admin token also has the basic Matrix API scope (diff)
parentfixup changelog (diff)
downloadsynapse-6fc3deb0295fda1066c5cd5ecbddbb9ce1cf048c.tar.xz
Merge branch 'release-v1.85' into develop
Diffstat (limited to 'changelog.d/15681.misc')
-rw-r--r--changelog.d/15681.misc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/15681.misc b/changelog.d/15681.misc
deleted file mode 100644
index 2de551dd63..0000000000
--- a/changelog.d/15681.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump log from 0.4.17 to 0.4.18.