summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-26 17:50:28 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-26 17:50:28 +0100
commit5dd8087ea41fce6a9153d7b275c752bd3e409592 (patch)
tree8ccec4c3752deede87488a29d73db238bcfa9087 /synapse/rest/__init__.py
parentMerge branch 'client_server_url_rename' into develop (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into client_server_ur... (diff)
downloadsynapse-5dd8087ea41fce6a9153d7b275c752bd3e409592.tar.xz
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'synapse/rest/__init__.py')
0 files changed, 0 insertions, 0 deletions