summaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-12-02 06:48:32 -0500
committerJason R. Coombs <jaraco@jaraco.com>2012-12-02 06:48:32 -0500
commit7bde7840dd4ffeae3c794eca216244975c856f94 (patch)
tree4768627ba0e5e74234d8bba2f4674715b87d1772 /.gitignore
parent45aa88b530cff0ad09f5da83efd4697ba7986563 (diff)
parent0ae0e9800c7bfb3f8ea40fa0d33ebf6dff49f759 (diff)
Merge with master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3283ff38..5f9c3d74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ build/
dist/
paramiko.egg-info/
test.log
+docs/