diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-19 12:55:25 -0600 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-19 12:55:25 -0600 |
| commit | 31425d82a38066355c313d0d81b8e10159c73f61 (patch) | |
| tree | 87f7c7a7348b37e6244b1a10a75777ee2e022966 /tox.ini | |
| parent | Fix fallback auth on Python 3 (#4197) (diff) | |
| parent | Merge tag 'v0.33.9' (diff) | |
| download | synapse-31425d82a38066355c313d0d81b8e10159c73f61.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions