Merge remote branch 'origin/master'

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ffdcd24..cef8774 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,20 @@
 localsettings.py
 dev.sqlite
 *.db
+*.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
+/wolnelektury/static/css/ie.min*.css
+/wolnelektury/static/css/screen.min*.css
+/wolnelektury/static/js/base*.min.js
 
 # Python garbage
 *.pyc
@@ -27,3 +34,8 @@ thumbs.db
 .pydevproject
 .tmp_*
 
+# Tags file
+TAGS
+
+media
+search_index