summaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-01-30 10:40:35 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-01-30 10:40:35 -0800
commit8cc9ae059ffa6e484d24149ff7508555bfaed1b6 (patch)
treed9c8dde5cfb2537e83ffedad1e3490608c9943b2 /.gitignore
parent935c55dd1f596f97bd8c3d76dd8abfe9cffaa8b0 (diff)
parenta83f0d3038e8d16e7c160293d16c2736645564d6 (diff)
Merge branch '1.11' into 1.12
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4b578950..9e1febf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ dist/
paramiko.egg-info/
test.log
docs/
+!sites/docs
+_build