diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
commit | c02da58a9da5c617c80fbeb7205f163e7b410c6f (patch) | |
tree | 8b166570eb2cbbecb7640d92d072f31add922535 /synapse/__init__.py | |
parent | Consume errors in time_bound_deferred (diff) | |
parent | Merge pull request #74 from matrix-org/federation_min_depth_fix (diff) | |
download | synapse-c02da58a9da5c617c80fbeb7205f163e7b410c6f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions