summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-09-15 15:42:44 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-09-15 15:42:44 +0100
commit9fc0aad567254efe82bc9093f5eb07e0a991356b (patch)
tree74649ee09434e392809ab63b80a621a78f49d40e /synapse/crypto
parentMerge branch 'daniel/insecureclient' into develop (diff)
parentBump version/changelog (diff)
downloadsynapse-9fc0aad567254efe82bc9093f5eb07e0a991356b.tar.xz
Merge branch 'master' into daniel/insecureclient
Diffstat (limited to 'synapse/crypto')
0 files changed, 0 insertions, 0 deletions