summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-11-19 12:55:25 -0600
committerAmber Brown <hawkowl@atleastfornow.net>2018-11-19 12:55:25 -0600
commit31425d82a38066355c313d0d81b8e10159c73f61 (patch)
tree87f7c7a7348b37e6244b1a10a75777ee2e022966 /docker
parentFix fallback auth on Python 3 (#4197) (diff)
parentMerge tag 'v0.33.9' (diff)
downloadsynapse-31425d82a38066355c313d0d81b8e10159c73f61.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions