diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:21:33 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:21:33 +0000 |
commit | 08e70231c9947321a39c878d4c6eca96e5a2226d (patch) | |
tree | ca956ee4047223b265dcde0d0c14e47a61f17bb7 /synapse/federation/federation_server.py | |
parent | Remove unused import (diff) | |
parent | Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-08e70231c9947321a39c878d4c6eca96e5a2226d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
Diffstat (limited to 'synapse/federation/federation_server.py')
0 files changed, 0 insertions, 0 deletions