summary refs log tree commit diff
path: root/synapse/config/key.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-24 11:29:46 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-24 11:29:46 +0100
commitc253b14f6ec4e0efb78bc329f71e63fa3ddb0068 (patch)
treef29fd33ade7d123324d5db2f29d7a37a1fe4ed0e /synapse/config/key.py
parentMerge branch 'develop' into key_distribution (diff)
parentFix spelling (diff)
downloadsynapse-c253b14f6ec4e0efb78bc329f71e63fa3ddb0068.tar.xz
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse/config/key.py')
0 files changed, 0 insertions, 0 deletions