summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-15 15:17:47 +0100
committerErik Johnston <erik@matrix.org>2015-06-15 15:17:47 +0100
commitf0583f65e18925cda99a7d761cfaf3ce9a3ac2f9 (patch)
treed3f16593aea2d6871365cc24bcc09fd048885920 /synapse/config/server.py
parentMerge pull request #183 from intelfx/install-python-schema-deltas (diff)
parentMerge pull request #186 from matrix-org/hotfixes-v0.9.2-r2 (diff)
downloadsynapse-f0583f65e18925cda99a7d761cfaf3ce9a3ac2f9.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/server.py')
0 files changed, 0 insertions, 0 deletions