summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-07 14:55:06 +0000
committerErik Johnston <erik@matrix.org>2015-01-07 14:55:06 +0000
commitcc7a267a85eb3341cef5313010ac195e166f2c0f (patch)
tree27510a6358b8bc219ccd456622b963a3b394bee3 /synapse/server.py
parentRemove unused import (diff)
parentImprove change log (diff)
downloadsynapse-cc7a267a85eb3341cef5313010ac195e166f2c0f.tar.xz
Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions