summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-07-05 11:04:01 +0100
committerNeil Johnson <neil@matrix.org>2018-07-05 11:04:01 +0100
commitfeef8461d19c51f3766471e17e2a2f8a2b36c785 (patch)
tree553d0ec78e6e656bacd87149b8d7cca2b613e2d8 /synapse/__init__.py
parentMerge pull request #3483 from matrix-org/rav/more_server_name_validation (diff)
parentImplementation of server_acls (diff)
downloadsynapse-feef8461d19c51f3766471e17e2a2f8a2b36c785.tar.xz
Merge remote-tracking branch 'hera/rav/server_acls' into develop
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions