Merge branch 'lucene_memory'

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 38a691b..c3e3e48 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,19 @@
 localsettings.py
 dev.sqlite
 *.db
+*.db-journal
 *~
 *.orig
+*.log
+
+# Compress output
+/static
 
 # Python garbage
 *.pyc
 .coverage
 pip-log.txt
+nosetests.xml
 
 # Mac OS X garbage
 .DS_Store
@@ -21,3 +27,8 @@ thumbs.db
 .pydevproject
 .tmp_*
 
+# Tags file
+TAGS
+
+media
+search_index