diff options
author | Matthew Hodgson <matthew@matrix.org> | 2014-12-08 19:37:07 +0000 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2014-12-08 19:37:07 +0000 |
commit | c46ce4fca2c75f7f0ea2dfca3db677850efd2681 (patch) | |
tree | 0ead2b50f6c3fcde3ddce59711055cc07bf11166 /synapse/federation/replication.py | |
parent | fix a million stupid bugs and make it actually work (diff) | |
parent | Ignore pycharm dir (diff) | |
download | synapse-c46ce4fca2c75f7f0ea2dfca3db677850efd2681.tar.xz |
Merge branch 'develop' into federation_retries
Diffstat (limited to 'synapse/federation/replication.py')
0 files changed, 0 insertions, 0 deletions