certbot

mirror of https://github.com/certbot/certbot.git synced 2026-01-21 19:01:07 +03:00

Files

James Kasten 8c6cfaded0 Merge branch 'master' into reverter

Conflicts:
	letsencrypt/client/apache/configurator.py
	letsencrypt/client/crypto_util.py
	letsencrypt/client/display.py
	letsencrypt/client/revoker.py
	letsencrypt/client/tests/apache/configurator_test.py
	letsencrypt/client/tests/apache/dvsni_test.py
	letsencrypt/scripts/main.py

2015-01-24 21:42:26 -08:00