summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-26 18:16:31 +0000
committerErik Johnston <erik@matrix.org>2015-10-26 18:16:31 +0000
commita299fede9d7a25361a2f118a6530c46527b96d8d (patch)
treeeaf53c0c919aefcc46c03555ae7da83d8ee9a371 /synapse/server.py
parentUse correct service url (diff)
parentMerge pull request #330 from matrix-org/erikj/login_fallback (diff)
downloadsynapse-a299fede9d7a25361a2f118a6530c46527b96d8d.tar.xz
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into release-v0.10.1
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions