summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-16 09:47:22 +0000
committerErik Johnston <erik@matrix.org>2015-02-16 09:47:22 +0000
commit8a59915d7d3d0001cb5f9e382efcf65dcbc25359 (patch)
treefc9e8a2d1b5a9a84bfe12738e2e04a499b72d482 /synapse/server.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentBump version (diff)
downloadsynapse-8a59915d7d3d0001cb5f9e382efcf65dcbc25359.tar.xz
Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions