summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-20 10:00:13 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-20 10:00:13 +0000
commitb2aeaa2dcc833430330b556453acb83b23a95650 (patch)
tree81807cc40eded2faae7bfb7f969ada5b31798642 /synapse/crypto
parentSYN-153: Fix formatting of federation error message (diff)
parenttypoe (diff)
downloadsynapse-b2aeaa2dcc833430330b556453acb83b23a95650.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/crypto')
0 files changed, 0 insertions, 0 deletions