summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-10-14 16:01:21 -0400
committerChris McDonough <chrism@plope.com>2012-10-14 16:01:21 -0400
commit6c4a1e7bdc4239e3c8fa3cfe6673a6e800ce113d (patch)
tree01b40784f098d34236e798b61f2fa897f5c115c5 /.gitignore
parent1207dbed3f2e4cc765fd2078f9c622329324ffe0 (diff)
parent67fa5ad66216b6a1aa71fed639e3d2d82aa4458d (diff)
downloadpyramid-6c4a1e7bdc4239e3c8fa3cfe6673a6e800ce113d.tar.gz
pyramid-6c4a1e7bdc4239e3c8fa3cfe6673a6e800ce113d.tar.bz2
pyramid-6c4a1e7bdc4239e3c8fa3cfe6673a6e800ce113d.zip
Merge branch 'feature-basic-auth'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8e2f83e7d..5fa2a2ee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
*.pt.py
*.txt.py
*~
+.*.swp
.coverage
.tox/
nosetests.xml
@@ -21,3 +22,4 @@ bookenv/
jyenv/
pypyenv/
env*/
+venv/