Merge branch 'master' into standalone_authenticator

Conflicts: letsencrypt/client/CONFIG.py letsencrypt/client/tests/apache/dvsni_test.py letsencrypt/client/tests/challenge_util_test.py
2026-08-03 03:52:02 +02:00 · 2015-02-09 15:17:43 -08:00
parent b4418f72ff 35ea205ea1
commit 627302e060
32 changed files with 652 additions and 494 deletions
@@ -23,6 +23,7 @@ changes = read_file(os.path.join(here, 'CHANGES.rst'))

 install_requires = [
    'argparse',
+    'ConfArgParse',
    'jsonschema',
    'mock',
    'pycrypto',