summary refs log tree commit diff
path: root/res/templates
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-05-16 16:48:10 +0100
committerNeil Johnson <neil@matrix.org>2018-05-16 16:48:10 +0100
commit85b8acdeb44520bd5ec2d08545a5e5e2862310d1 (patch)
treec5ee65b943ea47501184021150ee08b3de3e6427 /res/templates
parentMerge pull request #3163 from matrix-org/cohort_analytics (diff)
parentbump version and changelog for 0.29.0 (diff)
downloadsynapse-85b8acdeb44520bd5ec2d08545a5e5e2862310d1.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'res/templates')
0 files changed, 0 insertions, 0 deletions