diff options
author | Neil Johnson <neil@matrix.org> | 2018-07-05 11:04:01 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-07-05 11:04:01 +0100 |
commit | feef8461d19c51f3766471e17e2a2f8a2b36c785 (patch) | |
tree | 553d0ec78e6e656bacd87149b8d7cca2b613e2d8 /contrib/docker/conf | |
parent | Merge pull request #3483 from matrix-org/rav/more_server_name_validation (diff) | |
parent | Implementation of server_acls (diff) | |
download | synapse-feef8461d19c51f3766471e17e2a2f8a2b36c785.tar.xz |
Merge remote-tracking branch 'hera/rav/server_acls' into develop
Diffstat (limited to 'contrib/docker/conf')
0 files changed, 0 insertions, 0 deletions