summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-26 10:22:41 +0100
committerErik Johnston <erik@matrix.org>2015-05-26 10:22:41 +0100
commit45fffe8cbed41dfe5c263015eb8f3cca19d8f1b8 (patch)
tree9598bfe75f8553ce5da7f30b41be260572760406 /synapse/server.py
parentBump version (diff)
parentMerge pull request #165 from matrix-org/bugs/SYN-390 (diff)
downloadsynapse-45fffe8cbed41dfe5c263015eb8f3cca19d8f1b8.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions