diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-04-21 17:10:25 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-04-21 17:10:25 +0100 |
commit | 3ba522bb231fd2ea76dfc8f4ea868cfdcc0fcb62 (patch) | |
tree | 33d118993d505a320d0dab99adcd40c40f5a0061 /synapse/config | |
parent | Merge branch 'develop' into key_distribution (diff) | |
parent | Bump syutil version to 0.0.5 (diff) | |
download | synapse-3ba522bb231fd2ea76dfc8f4ea868cfdcc0fcb62.tar.xz |
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions