diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-19 12:50:17 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-19 12:50:17 +0100 |
| commit | 9de94d5a4d34c59b87f698fdde9027029e4de41b (patch) | |
| tree | 713ffe00f3b83a93f3df3f0bff3cb6b153e46362 /synapse/streams | |
| parent | Don't reuse var names (diff) | |
| parent | SYN-383: Handle the fact the server might not have signed things (diff) | |
| download | synapse-9de94d5a4d34c59b87f698fdde9027029e4de41b.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