summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2019-09-09 17:37:52 +0300
committerGitHub <noreply@github.com>2019-09-09 17:37:52 +0300
commit63f9317b8e862e01872c0f8a3485748687ccd232 (patch)
tree737c05ba2b4d9da571b534dfb7f6daa97df8c14b /setup.py
parentMerge pull request #5934 from matrix-org/erikj/censor_redactions (diff)
parentFix code style, again (diff)
downloadsynapse-63f9317b8e862e01872c0f8a3485748687ccd232.tar.xz
Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users
Only count real users when checking for auto-creation of auto-join room
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions