diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-14 03:11:25 +1000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-14 03:11:25 +1000 |
| commit | 73884ebac59f091ac44cf81b7fb8854cdd4a3785 (patch) | |
| tree | 63890fa9d273b69a19fa581e1dce83eb4ab55b38 /synapse/http/matrixfederationclient.py | |
| parent | buffer? (diff) | |
| parent | merge (#3576) (diff) | |
| download | synapse-73884ebac59f091ac44cf81b7fb8854cdd4a3785.tar.xz | |
Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
0 files changed, 0 insertions, 0 deletions