summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-03-19 10:37:50 +0000
committerRichard van der Hoff <richard@matrix.org>2019-03-19 10:37:50 +0000
commitd2a537ea605b50a34cbf234d140f9a7edfeb9785 (patch)
tree04baa6a2c9e995fe422107c179616e492b355da0 /.circleci
parentComment out most options in the generated config. (#4863) (diff)
parentRepoint docs for federation (#4881) (diff)
downloadsynapse-d2a537ea605b50a34cbf234d140f9a7edfeb9785.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions