summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorHalf-Shot <will@half-shot.uk>2019-08-23 09:55:57 +0100
committerHalf-Shot <will@half-shot.uk>2019-08-23 09:55:57 +0100
commitffa5b757c7775b1fffa4b2d998407be61369ce7f (patch)
treeb332966f46b979b9e068b6547768ae20378366cf /docker
parentFix registration test (diff)
parentAdd changelog (diff)
downloadsynapse-ffa5b757c7775b1fffa4b2d998407be61369ce7f.tar.xz
Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions