Merge branch 'master' of https://github.com/fnp/wolnelektury

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1befb63..cef8774 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ dev.sqlite
 *.db-journal
 *~
 *.orig
 *.db-journal
 *~
 *.orig

+*.log

 
 # Compress output
 /wolnelektury/static/css/all.min*.css
 
 # Compress output
 /wolnelektury/static/css/all.min*.css


@@ -11,6 +12,9 @@ dev.sqlite
 /wolnelektury/static/css/book.min*.css
 /wolnelektury/static/js/book*.min.js
 /wolnelektury/static/js/jquery.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
 
 # Python garbage
 *.pyc


@@ -30,3 +34,8 @@ thumbs.db
 .pydevproject
 .tmp_*
 
 .pydevproject
 .tmp_*
 

+# Tags file
+TAGS
+
+media
+search_index