diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2019-05-01 10:55:14 -0400 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-05-01 10:55:14 -0400 |
commit | 12875f995adb7a2d032a8492030a770fbb5c40a3 (patch) | |
tree | 4b9939e5152658caa737deab925a35cadcc324a5 /tests/http/test_fedclient.py | |
parent | target better for the shhs release docker hub, pt 3 (diff) | |
parent | Merge pull request #5116 from matrix-org/babolivier/account_expiration (diff) | |
download | synapse-12875f995adb7a2d032a8492030a770fbb5c40a3.tar.xz |
Merge remote-tracking branch 'origin/develop' into shhs
Diffstat (limited to 'tests/http/test_fedclient.py')
0 files changed, 0 insertions, 0 deletions