diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-04-23 12:04:50 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-04-23 12:04:50 -0400 |
| commit | 68384d96fd22a874b62caa21d51418d447259b0d (patch) | |
| tree | 0aa751070f6d62b92fd607f67c59b13c61d0039a /tox.ini | |
| parent | Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t... (diff) | |
| parent | Merge tag 'v1.12.4' (diff) | |
| download | synapse-68384d96fd22a874b62caa21d51418d447259b0d.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions