summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-22 11:38:27 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-22 11:38:27 +0100
commitb898a5600ac360c2257775bb80a92344b367f054 (patch)
tree5de765d7934dc5afdf20e35ada2c07299bc150a0 /.circleci
parentRoom Statistics (#4338) (diff)
parentupdate changelog (diff)
downloadsynapse-b898a5600ac360c2257775bb80a92344b367f054.tar.xz
Merge branch 'master' into develop
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions