Merge commit '9bea91a' into merge_small_prs

[osqa.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index fa698c6521af08971fdc939af4d9eda92a8b0763..7b7b758727ef4635af387aa9772bfe0efc40897f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 log/django.osqa.log
 tmp/*
 
+osqa.wsgi
+settings_local.py