diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-03-03 14:58:37 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-03-03 14:58:37 +0000 |
| commit | fe6ab0439d4fabf166fa74def4ebbf9a9db054b6 (patch) | |
| tree | 90a5a82c909bacc82b010056c59458d29e755a6f /changelog.d | |
| parent | Merge branch 'babolivier/complete_sso_login_saml' into 'release-v1.11.1' (diff) | |
| parent | v1.11.1 (diff) | |
| download | synapse-fe6ab0439d4fabf166fa74def4ebbf9a9db054b6.tar.xz | |
Merge branch 'babolivier/v1.11.1-changelog' into 'release-v1.11.1'
v1.11.1 See merge request new-vector/synapse!6
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/6910.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/6996.bugfix | 1 |
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'`. |