summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-09 10:41:43 +0000
committerGitHub <noreply@github.com>2018-08-09 10:41:43 +0000
commit0ad98e38d0c5f6fde18032551cccb291659b9204 (patch)
tree925f1657770ba47599169763dc1be02b6156923d /synapse/appservice
parentMerge branch 'master' into develop (diff)
parentfix pep8 too many lines (diff)
downloadsynapse-0ad98e38d0c5f6fde18032551cccb291659b9204.tar.xz
Merge pull request #3655 from matrix-org/neilj/disable_hs
Flag to disable HS without disabling federation
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions