diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-04-23 11:23:53 +0200 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-04-23 11:23:53 +0200 |
commit | 2e3b9a0fcb81b539e155004ded8017ee9923eecc (patch) | |
tree | 89e50fed5deacacf5801c13c69d8da4f34191358 /tox.ini | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-2e3b9a0fcb81b539e155004ded8017ee9923eecc.tar.xz |
Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_token""
This reverts commit 1adf6a55870aa08de272591ff49db9dc49738076.
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions