summaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-09-17 17:42:19 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-09-17 17:42:19 -0700
commit20355d22ec4d674e7c0ae04ef72b3755f6306ba8 (patch)
treef3a016e1a38f913c994570e8ef9baca151b97d9b /.gitignore
parent487ae193970c200549b75c391c65999909540d53 (diff)
parentf09a0d3853ab7848ed8cd16148ce95ff58e09e8a (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 44b45974..4345d86c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,9 @@ build/
dist/
.tox/
paramiko.egg-info/
-test.log
docs/
demos/*.log
!sites/docs
_build
.coverage
+.cache