Merge branch 'production' into pretty

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ffdcd24..230a876 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,16 @@
 localsettings.py
 dev.sqlite
 *.db
 localsettings.py
 dev.sqlite
 *.db

+*.db-journal

 *~
 *.orig
 *~
 *.orig

+*.log

 
 # Compress output
 /wolnelektury/static/css/all.min*.css
 /wolnelektury/static/js/all*.min.js
 
 # 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
 
 # Python garbage
 /wolnelektury/static/js/jquery.min.js
 
 # Python garbage


@@ -27,3 +31,7 @@ thumbs.db
 .pydevproject
 .tmp_*
 
 .pydevproject
 .tmp_*
 

+# Tags file
+TAGS
+
+media