summary refs log tree commit diff
path: root/changelog.d/3687.feature
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-15 16:27:08 +0100
committerNeil Johnson <neil@matrix.org>2018-08-15 16:27:08 +0100
commit86a00e05e1db0fd4fa7a0192520504c229b6f79c (patch)
tree17c0ac3804e223913549a50cfa6c5d5616824568 /changelog.d/3687.feature
parentMerge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... (diff)
parentMerge pull request #3653 from matrix-org/erikj/split_federation (diff)
downloadsynapse-86a00e05e1db0fd4fa7a0192520504c229b6f79c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'changelog.d/3687.feature')
-rw-r--r--changelog.d/3687.feature2
1 files changed, 1 insertions, 1 deletions
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