summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-09 14:53:30 +0000
committerErik Johnston <erik@matrix.org>2014-12-09 14:53:30 +0000
commitd45c030652d879ef0b967bfe1dd85627ac22eb79 (patch)
tree47cd5652d60fc765824bc75afa74b232bbcdaee1 /synapse/server.py
parentPEP8 (diff)
parentIgnore pycharm dir (diff)
downloadsynapse-d45c030652d879ef0b967bfe1dd85627ac22eb79.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions