summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 15:21:33 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 15:21:33 +0000
commit08e70231c9947321a39c878d4c6eca96e5a2226d (patch)
treeca956ee4047223b265dcde0d0c14e47a61f17bb7 /synapse/federation
parentRemove unused import (diff)
parentMerge branch 'consumeErrors' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-08e70231c9947321a39c878d4c6eca96e5a2226d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into failures
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions