diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-19 11:56:35 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-19 11:56:35 +0100 |
commit | 01858bcbf2b59f3230e942a714f0c181cc8d9a06 (patch) | |
tree | 2a768ddf003402fbfc3fba1544325d30501f3da1 /synapse/streams | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf (diff) | |
parent | SYN-383: Fix parsing of verify_keys and catching of _DefGen_Return (diff) | |
download | synapse-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