diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:18 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:18 -0800 |
| commit | 5f08308ffd13e952d65f780f6f9b74379d8b868a (patch) | |
| tree | 5aa37f26527a6ea081d34fa8fb310d5e0389752b /tox-requirements.txt | |
| parent | 51cafed29a8b87f58718f55a449a8c4e499addb4 (diff) | |
| parent | 964cb2f122c5cb6776177f099d1d8cdebd849812 (diff) | |
Merge branch '1.18' into 2.0
# Conflicts:
# sites/www/changelog.rst
# tox-requirements.txt
# tox.ini
Diffstat (limited to 'tox-requirements.txt')
| -rw-r--r-- | tox-requirements.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tox-requirements.txt b/tox-requirements.txt deleted file mode 100644 index 9645f854..00000000 --- a/tox-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Not sure why tox can't just read setup.py? -cryptography >= 1.1 -pyasn1 >= 0.1.7 |