summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-19 11:56:35 +0100
committerErik Johnston <erik@matrix.org>2015-05-19 11:56:35 +0100
commit01858bcbf2b59f3230e942a714f0c181cc8d9a06 (patch)
tree2a768ddf003402fbfc3fba1544325d30501f3da1 /synapse/streams
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf (diff)
parentSYN-383: Fix parsing of verify_keys and catching of _DefGen_Return (diff)
downloadsynapse-01858bcbf2b59f3230e942a714f0c181cc8d9a06.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'synapse/streams')
0 files changed, 0 insertions, 0 deletions