Merge branch 'master' into issue4331

This commit is contained in:
Erica Portnoy 2017-03-27 14:08:39 -07:00
commit b7bb75886e

View file

@ -11,7 +11,7 @@ install_requires = [
'acme=={0}'.format(version),
'certbot=={0}'.format(version),
'mock',
'python-augeas',
'python-augeas<=0.5.0',
# For pkg_resources. >=1.0 so pip resolves it to a version cryptography
# will tolerate; see #2599:
'setuptools>=1.0',