summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-06-22 13:03:44 +0100
committerMatthew Hodgson <matthew@matrix.org>2017-06-22 13:03:44 +0100
commitccfcef6b59a9ae4737297662a1ecd4a3251e20d2 (patch)
treec7e30a35b0b569725349ce8eba4d132dbc670f9c /synapse/config/homeserver.py
parentAdd desc (diff)
parentMerge pull request #2282 from matrix-org/release-v0.21.1 (diff)
downloadsynapse-ccfcef6b59a9ae4737297662a1ecd4a3251e20d2.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config/homeserver.py')
0 files changed, 0 insertions, 0 deletions