diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:45 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:45 -0800 |
| commit | ec3fdd72dba89626635e5ea1c31ac65a31091042 (patch) | |
| tree | 043da5ecf08a14c1bee58ac055f3672e51108d8f /tox-requirements.txt | |
| parent | a6b7648d93eb36d8e52b5761604b187d02bc1b5a (diff) | |
| parent | 5f08308ffd13e952d65f780f6f9b74379d8b868a (diff) | |
Merge branch '2.0' into 2.1
# Conflicts:
# sites/www/changelog.rst
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 |