Merge branch 'master' into sunburnt

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 944c338..c3e3e48 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,13 +4,10 @@ dev.sqlite
 *.db-journal
 *~
 *.orig
+*.log
 
 # Compress output
-/wolnelektury/static/css/all.min*.css
-/wolnelektury/static/js/all*.min.js
-/wolnelektury/static/css/book.min*.css
-/wolnelektury/static/js/book*.min.js
-/wolnelektury/static/js/jquery.min.js
+/static
 
 # Python garbage
 *.pyc
@@ -31,4 +28,7 @@ thumbs.db
 .tmp_*
 
 # Tags file
-TAGS
\ No newline at end of file
+TAGS
+
+media
+search_index