summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-12 15:24:06 +0000
committerErik Johnston <erik@matrix.org>2015-02-12 15:24:06 +0000
commit92d850fc874aa5c77659adb6b5d38a99f989f0b5 (patch)
tree64f05ff96a9a1bb60374ea803d921f5256903e51 /synapse/federation
parentMerge branch 'release-v0.7.0' of github.com:matrix-org/synapse (diff)
parentMerge pull request #69 from matrix-org/hotfixes-v0.7.0a (diff)
downloadsynapse-92d850fc874aa5c77659adb6b5d38a99f989f0b5.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions