summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-23 15:36:59 +0100
committerErik Johnston <erik@matrix.org>2016-09-23 15:36:59 +0100
commit4225a97f4e63ce82a21ea1e07c0a54324df261ec (patch)
tree006b8f4be1beba9aacbcd9ce379cb40ff6bd2f22 /synapse/streams
parentMerge pull request #1136 from matrix-org/erikj/fix_signed_3pid (diff)
parentMerge branch 'release-v0.18.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-4225a97f4e63ce82a21ea1e07c0a54324df261ec.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions