summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-12-08 19:37:07 +0000
committerMatthew Hodgson <matthew@matrix.org>2014-12-08 19:37:07 +0000
commitc46ce4fca2c75f7f0ea2dfca3db677850efd2681 (patch)
tree0ead2b50f6c3fcde3ddce59711055cc07bf11166 /synapse/federation
parentfix a million stupid bugs and make it actually work (diff)
parentIgnore pycharm dir (diff)
downloadsynapse-c46ce4fca2c75f7f0ea2dfca3db677850efd2681.tar.xz
Merge branch 'develop' into federation_retries
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions