summary refs log tree commit diff
path: root/synapse/api/constants.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-05 10:29:32 +0100
committerErik Johnston <erik@matrix.org>2018-07-05 10:29:32 +0100
commite2a4b7681e865d120b04d452dfe6da923dce6fbd (patch)
tree66aa5bfb484a59a7d5a5d3ebc3f3c3e7cee150eb /synapse/api/constants.py
parentMerge pull request #3476 from matrix-org/erikj/timeout_memberships (diff)
parentMerge pull request #3483 from matrix-org/rav/more_server_name_validation (diff)
downloadsynapse-e2a4b7681e865d120b04d452dfe6da923dce6fbd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/constants.py')
0 files changed, 0 insertions, 0 deletions