diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-10 16:37:49 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-10 16:37:49 +0000 |
commit | dd486836f7b88cad7efee0323bb9691a054722f6 (patch) | |
tree | 0c7c3d0869dca471cf5c2f03594ef8533c24d5dc /tox.ini | |
parent | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job (diff) | |
parent | Fix resetting password via a phone number (#21) (diff) | |
download | synapse-dd486836f7b88cad7efee0323bb9691a054722f6.tar.xz |
Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini index 0c4d562766..8b56a34878 100644 --- a/tox.ini +++ b/tox.ini @@ -128,7 +128,7 @@ commands = /bin/sh -c "isort -c -df -sp setup.cfg -rc synapse tests" skip_install = True deps = towncrier>=18.6.0rc1 commands = - python -m towncrier.check --compare-with=origin/develop + python -m towncrier.check --compare-with=origin/dinsic basepython = python3.6 [testenv:check-sampleconfig] |