diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 17:50:28 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 17:50:28 +0100 |
commit | 5dd8087ea41fce6a9153d7b275c752bd3e409592 (patch) | |
tree | 8ccec4c3752deede87488a29d73db238bcfa9087 /synapse/server.py | |
parent | Merge branch 'client_server_url_rename' into develop (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur... (diff) | |
download | synapse-5dd8087ea41fce6a9153d7b275c752bd3e409592.tar.xz |
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions