summary refs log tree commit diff
path: root/changelog.d/3556.feature
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-08 15:55:47 +0000
committerGitHub <noreply@github.com>2018-08-08 15:55:47 +0000
commitd2f3ef98ac21929805f63a8a4964c3b97a22d1e1 (patch)
tree7eac0a444d3b04cb11d49a28b0d61a7c4f795d2d /changelog.d/3556.feature
parentAbility to disable client/server Synapse via conf toggle (diff)
parentMerge pull request #3662 from matrix-org/neilj/reserved_users (diff)
downloadsynapse-d2f3ef98ac21929805f63a8a4964c3b97a22d1e1.tar.xz
Merge branch 'develop' into neilj/disable_hs
Diffstat (limited to 'changelog.d/3556.feature')
0 files changed, 0 insertions, 0 deletions