diff options
| author | Erik Johnston <erik@matrix.org> | 2020-01-09 13:25:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-01-09 13:25:48 +0000 |
| commit | d773290cb1d015f0debe5f64f4e495612cf1da60 (patch) | |
| tree | 33a7294ddad2c3fbbcbbd7b4831b6813176515dd /changelog.d | |
| parent | Merge pull request #6664 from matrix-org/erikj/media_admin_apis (diff) | |
| parent | Fixup changelog (diff) | |
| download | synapse-d773290cb1d015f0debe5f64f4e495612cf1da60.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/6563.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/6657.bugfix | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/changelog.d/6563.bugfix b/changelog.d/6563.bugfix deleted file mode 100644 index 3325fb1dcf..0000000000 --- a/changelog.d/6563.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix GET request on /_synapse/admin/v2/users endpoint. Contributed by Awesome Technologies Innovationslabor GmbH. \ No newline at end of file diff --git a/changelog.d/6657.bugfix b/changelog.d/6657.bugfix deleted file mode 100644 index 94e51a9896..0000000000 --- a/changelog.d/6657.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix incorrect signing of responses from the key server implementation. \ No newline at end of file |