summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-10-07 10:11:57 -0300
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-10-07 10:11:57 -0300
commit68829269827ec4558fb04d1edf24c309f4a07ba1 (patch)
tree0c05ff972d818ed247b9c1c45f39d3d55b36cc76 /.gitignore
parent8acee71fc60fd3cbd47013a656b65f521ed00f74 (diff)
parent227ca9c33d53cf866353773e669121169eee305e (diff)
downloadaskbot-68829269827ec4558fb04d1edf24c309f4a07ba1.tar.gz
askbot-68829269827ec4558fb04d1edf24c309f4a07ba1.tar.bz2
askbot-68829269827ec4558fb04d1edf24c309f4a07ba1.zip
Merge branch 'master' into bug97
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 15b8d802..0375e009 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.pyc
*.swp
*.log
+db
cache/??
run
*.wsgi