diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-25 15:25:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-25 15:25:31 +0100 |
| commit | b94a43d5b5a949fbd67109b34cfcec925fa82fe4 (patch) | |
| tree | 1e427071264b9cd23233175b3cff4684d93d6e36 /.circleci | |
| parent | Use allow/deny (diff) | |
| parent | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin (diff) | |
| download | synapse-b94a43d5b5a949fbd67109b34cfcec925fa82fe4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions