diff options
author | Neil Johnson <neil@matrix.org> | 2018-05-16 16:48:10 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-05-16 16:48:10 +0100 |
commit | 85b8acdeb44520bd5ec2d08545a5e5e2862310d1 (patch) | |
tree | c5ee65b943ea47501184021150ee08b3de3e6427 /synapse/config/key.py | |
parent | Merge pull request #3163 from matrix-org/cohort_analytics (diff) | |
parent | bump version and changelog for 0.29.0 (diff) | |
download | synapse-85b8acdeb44520bd5ec2d08545a5e5e2862310d1.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config/key.py')
0 files changed, 0 insertions, 0 deletions