diff options
author | Erik Johnston <erikj@jki.re> | 2018-08-24 17:15:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-24 17:15:32 +0100 |
commit | 9fbaed325f7e3ed4edff25636043b885b1cf388d (patch) | |
tree | 5eb84f8afc267ba3af4199e3da3f9a4d17bbdb0b /.circleci | |
parent | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_notices (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact (diff) | |
download | synapse-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