summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-08-24 17:15:32 +0100
committerGitHub <noreply@github.com>2018-08-24 17:15:32 +0100
commit9fbaed325f7e3ed4edff25636043b885b1cf388d (patch)
tree5eb84f8afc267ba3af4199e3da3f9a4d17bbdb0b /.circleci
parentMerge pull request #3756 from matrix-org/erikj/fix_tags_server_notices (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact (diff)
downloadsynapse-9fbaed325f7e3ed4edff25636043b885b1cf388d.tar.xz
Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3
Change admin_uri to admin_contact in config and errors
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions