summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-02 11:03:13 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-02 11:03:13 +0100
commit2d55d43d40469b0613b761ededabf964717afb9a (patch)
treeb8ffc496ec87a9a0908a3fcc6b0aafcf2cac1e4a /synapse/app/homeserver.py
parentMerge remote-tracking branch 'origin/master' into develop (diff)
parentTrivial formatting fixes for README. (diff)
downloadsynapse-2d55d43d40469b0613b761ededabf964717afb9a.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/app/homeserver.py')
0 files changed, 0 insertions, 0 deletions