summary refs log tree commit diff
path: root/synapse/federation/federation_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-18 10:29:54 +0000
committerErik Johnston <erik@matrix.org>2015-02-18 10:29:54 +0000
commit2635d4e63459d77342d42ef4d2349524bf8fc982 (patch)
treec686ff3d612fe3f94b4e7d0e95e9d54da920a190 /synapse/federation/federation_base.py
parentMerge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop (diff)
parentMerge pull request #77 from matrix-org/failures (diff)
downloadsynapse-2635d4e63459d77342d42ef4d2349524bf8fc982.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/federation/federation_base.py')
0 files changed, 0 insertions, 0 deletions