summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-21 17:10:25 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-21 17:10:25 +0100
commit3ba522bb231fd2ea76dfc8f4ea868cfdcc0fcb62 (patch)
tree33d118993d505a320d0dab99adcd40c40f5a0061 /synapse/config
parentMerge branch 'develop' into key_distribution (diff)
parentBump syutil version to 0.0.5 (diff)
downloadsynapse-3ba522bb231fd2ea76dfc8f4ea868cfdcc0fcb62.tar.xz
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions