diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:27:08 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:27:08 +0100 |
| commit | 86a00e05e1db0fd4fa7a0192520504c229b6f79c (patch) | |
| tree | 17c0ac3804e223913549a50cfa6c5d5616824568 /changelog.d | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... (diff) | |
| parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
| download | synapse-86a00e05e1db0fd4fa7a0192520504c229b6f79c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/3653.feature | 1 | ||||
| -rw-r--r-- | changelog.d/3661.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/3687.feature | 2 | ||||
| -rw-r--r-- | changelog.d/3690.misc | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/3653.feature b/changelog.d/3653.feature new file mode 100644 index 0000000000..6c5422994f --- /dev/null +++ b/changelog.d/3653.feature @@ -0,0 +1 @@ +Support more federation endpoints on workers diff --git a/changelog.d/3661.bugfix b/changelog.d/3661.bugfix new file mode 100644 index 0000000000..f2b4703d80 --- /dev/null +++ b/changelog.d/3661.bugfix @@ -0,0 +1 @@ +Fix bug on deleting 3pid when using identity servers that don't support unbind API diff --git a/changelog.d/3687.feature b/changelog.d/3687.feature index 93b24d1acb..64b89f6411 100644 --- a/changelog.d/3687.feature +++ b/changelog.d/3687.feature @@ -1 +1 @@ -set admin email via config, to be used in error messages where the user should contact the administrator +set admin uri via config, to be used in error messages where the user should contact the administrator diff --git a/changelog.d/3690.misc b/changelog.d/3690.misc new file mode 100644 index 0000000000..710add0243 --- /dev/null +++ b/changelog.d/3690.misc @@ -0,0 +1 @@ +Rename MAU prometheus metrics |