diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2018-09-17 18:48:29 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2018-09-17 18:48:29 -0700 |
commit | 30d49449e38cb10a254983605d576d48a76a387b (patch) | |
tree | 4b1231b1a8a33c73659ef178878f3016c523b4c3 /.gitignore | |
parent | 75e6c377089c949df19b497fd9ba408ca82628c2 (diff) | |
parent | dc82971c1af0d147433c948dc440ffabdc276a7c (diff) |
Merge branch '2.2' into 2.3
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,9 +3,9 @@ build/ dist/ .tox/ paramiko.egg-info/ -test.log docs/ demos/*.log !sites/docs _build .coverage +.cache |