diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-28 10:38:23 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-28 10:38:23 -0700 |
commit | bb21c811d9159732d2f60e85961972a3bfc23afc (patch) | |
tree | 877e82007331f3ec571de25e98ec164248b42234 /tox-requirements.txt | |
parent | fdfbdbb6cc64927fe1e41592728d35eddecc08de (diff) | |
parent | d27fa785b61384e1a3255483f85458dde1751c50 (diff) |
Merge branch 'master' into 731-int
Diffstat (limited to 'tox-requirements.txt')
-rw-r--r-- | tox-requirements.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tox-requirements.txt b/tox-requirements.txt index 47ddd792..9645f854 100644 --- a/tox-requirements.txt +++ b/tox-requirements.txt @@ -1,3 +1,3 @@ # Not sure why tox can't just read setup.py? -cryptography >= 0.8 +cryptography >= 1.1 pyasn1 >= 0.1.7 |