Merge branch 'master' into funding

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 230a876..6714e23 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,10 @@ dev.sqlite
 *~
 *.orig
 *.log
 *~
 *.orig
 *.log

+.sass-cache

 
 # Compress output
 
 # 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
 
 # Python garbage
 *.pyc


@@ -35,3 +32,4 @@ thumbs.db
 TAGS
 
 media
 TAGS
 
 media

+search_index