diff options
| author | Jakub Warmuz <jakub@warmuz.org> | 2015-06-25 15:58:44 +0300 |
|---|---|---|
| committer | Jakub Warmuz <jakub@warmuz.org> | 2015-06-25 16:36:41 +0300 |
| commit | e51f300ee6044fefd8aad954f860f6703de825ce (patch) | |
| tree | f0d5ed1918ec810f8134b02324b6f38ed1baffe1 /.gitignore | |
| parent | 8a9759bf88b9ac87b969c063b2aca3439b5bff2a (diff) | |
| parent | 376bf9de6d16152921a9c58b1a582f6e10050597 (diff) | |
Merge remote-tracking branch 'github/letsencrypt/master' into csr
Conflicts:
letsencrypt/cli.py
letsencrypt/client.py
letsencrypt/tests/client_test.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index ace5d7a0f..9dac99790 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,7 @@ dist/ # editor temporary files *~ *.swp -\#*#
\ No newline at end of file +\#*# + +# auth --cert-path --chain-path +/*.pem
\ No newline at end of file |