summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-20 11:02:30 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-20 11:02:30 +0000
commit217950b9adb39920c66f97bd6e41e9b28d4e7b2f (patch)
tree07dcd7a895451bf4d534bf21e1b542e990ff20ba /synapse/crypto
parentMerge branch 'master' into develop (diff)
parentUse tagged version of matrix-angular-sdk (diff)
downloadsynapse-217950b9adb39920c66f97bd6e41e9b28d4e7b2f.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/crypto')
0 files changed, 0 insertions, 0 deletions