summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-03 14:58:37 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-03-03 14:58:37 +0000
commitfd983fad968941987314501b67147a264e2e927a (patch)
tree90a5a82c909bacc82b010056c59458d29e755a6f /changelog.d
parentMerge branch 'babolivier/complete_sso_login_saml' into 'release-v1.11.1' (diff)
downloadsynapse-fd983fad968941987314501b67147a264e2e927a.tar.xz
v1.11.1
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/6910.bugfix1
-rw-r--r--changelog.d/6996.bugfix1
2 files changed, 0 insertions, 2 deletions
diff --git a/changelog.d/6910.bugfix b/changelog.d/6910.bugfix
deleted file mode 100644
index 707f1ff7b5..0000000000
--- a/changelog.d/6910.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed set a user as an admin with the admin API `PUT /_synapse/admin/v2/users/<user_id>`. Contributed by @dklimpel.
diff --git a/changelog.d/6996.bugfix b/changelog.d/6996.bugfix
deleted file mode 100644
index 765d376c7c..0000000000
--- a/changelog.d/6996.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug which caused an error when joining a room, with `'coroutine' object has no attribute 'event_id'`.